mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-01 22:21:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/parse/grammar.y: fix assert to not trigger when there's no error argument

Browse source 
Original commit message from CVS:
* gst/parse/grammar.y:
fix assert to not trigger when there's no error argument
* gst/parse/parse.l:
fix definition of caps to allow more than two structures
* testsuite/caps/Makefile.am:
* testsuite/caps/renegotiate.c: (main):
it's sinesrc and works in that case
This commit is contained in:
Benjamin Otte 2004-05-04 17:00:11 +00:00
parent 656cee1af5
commit 2696ee9c90
7 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2004-05-04 Benjamin Otte <otte@gnome.org>
* gst/parse/grammar.y:
fix assert to not trigger when there's no error argument
* gst/parse/parse.l:
fix definition of caps to allow more than two structures
* testsuite/caps/Makefile.am:
* testsuite/caps/renegotiate.c: (main):
it's sinesrc and works in that case
2004-05-04 Wim Taymans <wim@fluendo.com> 2004-05-04 Wim Taymans <wim@fluendo.com>
* gst/schedulers/gstoptimalscheduler.c: (remove_from_group), * gst/schedulers/gstoptimalscheduler.c: (remove_from_group),

1
gst/parse/grammar.y
View file

@ -912,6 +912,7 @@ error1:
g_slist_foreach (g.links, (GFunc)gst_parse_free_link, NULL); g_slist_foreach (g.links, (GFunc)gst_parse_free_link, NULL);
g_slist_free (g.links); g_slist_free (g.links);
if (error)
g_assert (*error); g_assert (*error);
ret = NULL; ret = NULL;

2
gst/parse/parse.l
View file

@ -46,7 +46,7 @@ _mimetype ({_mimechar}+"/"{_mimechar}+)|("\""([^\"]|"\\\"")*"\"")|("'"([^']|"\\\
_capschar ("\\".)|([^\;!]) _capschar ("\\".)|([^\;!])
_capsstring {_capschar}+|("\""([^\"]|"\\\"")*"\"")|("'"([^']|"\\\"")*"'") _capsstring {_capschar}+|("\""([^\"]|"\\\"")*"\"")|("'"([^']|"\\\"")*"'")
_caps {_mimetype}(","[^!]|{_capsstring})* _caps {_mimetype}(","[^!]|{_capsstring})*
_link ("!"[[:space:]]*{_caps}([[:space:]]*";"[[:space:]]*{_caps})*[[:space:]]*"!")|("!") _link ("!"[[:space:]]*{_caps}([[:space:]]*(";"[[:space:]]*{_caps})*[[:space:]]*)*"!")|("!")
%x value %x value
%option noyywrap %option noyywrap

2
tests/old/testsuite/caps/Makefile.am
View file

@ -28,7 +28,7 @@ EXTRA_DIST = caps_strings
noinst_HEADERS = \ noinst_HEADERS = \
caps.h caps.h
tests_fail = renegotiate tests_fail =
tests_ignore = tests_ignore =
app_fixate_LDADD = $(GST_OBJ_LIBS) app_fixate_LDADD = $(GST_OBJ_LIBS)

7
tests/old/testsuite/caps/renegotiate.c
View file

@ -60,15 +60,16 @@ main (int argc, char *argv[])
const GList *l2; const GList *l2;
int i; int i;
int ret; int ret;
GError *error = NULL;
gst_init (&argc, &argv); gst_init (&argc, &argv);
/* change sinesrk to sinesrc once gst_parse_launch is fixed */ /* change sinesrk to sinesrc once gst_parse_launch is fixed */
pipeline = gst_parse_launch ("sinesrk ! audioconvert ! " pipeline = gst_parse_launch ("sinesrc ! audioconvert ! "
"audio/x-raw-int, channels=2, rate=48000;" "audio/x-raw-int, channels=2, rate=48000;"
"audio/x-raw-int, channels=1, rate=44100 !" "fakesink", NULL); "audio/x-raw-int, channels=1, rate=44100 !" "fakesink", &error);
if (pipeline == NULL) { if (error != NULL) {
g_print g_print
("oops, couldn't build pipeline. You probably don't have audioconvert or sinesrc\n"); ("oops, couldn't build pipeline. You probably don't have audioconvert or sinesrc\n");
exit (0); exit (0);

2
testsuite/caps/Makefile.am
View file

@ -28,7 +28,7 @@ EXTRA_DIST = caps_strings
noinst_HEADERS = \ noinst_HEADERS = \
caps.h caps.h
tests_fail = renegotiate tests_fail =
tests_ignore = tests_ignore =
app_fixate_LDADD = $(GST_OBJ_LIBS) app_fixate_LDADD = $(GST_OBJ_LIBS)

7
testsuite/caps/renegotiate.c
View file

@ -60,15 +60,16 @@ main (int argc, char *argv[])
const GList *l2; const GList *l2;
int i; int i;
int ret; int ret;
GError *error = NULL;
gst_init (&argc, &argv); gst_init (&argc, &argv);
/* change sinesrk to sinesrc once gst_parse_launch is fixed */ /* change sinesrk to sinesrc once gst_parse_launch is fixed */
pipeline = gst_parse_launch ("sinesrk ! audioconvert ! " pipeline = gst_parse_launch ("sinesrc ! audioconvert ! "
"audio/x-raw-int, channels=2, rate=48000;" "audio/x-raw-int, channels=2, rate=48000;"
"audio/x-raw-int, channels=1, rate=44100 !" "fakesink", NULL); "audio/x-raw-int, channels=1, rate=44100 !" "fakesink", &error);
if (pipeline == NULL) { if (error != NULL) {
g_print g_print
("oops, couldn't build pipeline. You probably don't have audioconvert or sinesrc\n"); ("oops, couldn't build pipeline. You probably don't have audioconvert or sinesrc\n");
exit (0); exit (0);