mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-23 08:46:40 +00:00
gst/parse/grammar.y: Remove handling of { } for threads.
Original commit message from CVS: * gst/parse/grammar.y: Remove handling of { } for threads.
This commit is contained in:
parent
e8b8381452
commit
4e8cd3c843
2 changed files with 7 additions and 7 deletions
|
@ -1,3 +1,8 @@
|
|||
2005-12-07 Michael Smith <msmith@fluendo.com>
|
||||
|
||||
* gst/parse/grammar.y:
|
||||
Remove handling of { } for threads.
|
||||
|
||||
2005-12-06 David Schleef <ds@schleef.org>
|
||||
|
||||
* libs/gst/base/gstbasetransform.c: speling fix.
|
||||
|
|
|
@ -563,7 +563,7 @@ static int yyerror (const char *s);
|
|||
%type <e> element
|
||||
%type <p> padlist pads assignments
|
||||
|
||||
%left '{' '}' '(' ')'
|
||||
%left '(' ')'
|
||||
%left ','
|
||||
%right '.'
|
||||
%left '!' '='
|
||||
|
@ -587,18 +587,13 @@ element: IDENTIFIER { $$ = gst_element_factory_make ($1, NULL);
|
|||
assignments: /* NOP */ { $$ = NULL; }
|
||||
| assignments ASSIGNMENT { $$ = g_slist_prepend ($1, $2); }
|
||||
;
|
||||
bin: '{' assignments chain '}' { GST_BIN_MAKE ($$, "thread", $3, $2); }
|
||||
| '(' assignments chain ')' { GST_BIN_MAKE ($$, "bin", $3, $2); }
|
||||
bin: '(' assignments chain ')' { GST_BIN_MAKE ($$, "bin", $3, $2); }
|
||||
| BINREF assignments chain ')' { GST_BIN_MAKE ($$, $1, $3, $2);
|
||||
gst_parse_strfree ($1);
|
||||
}
|
||||
| '{' assignments '}' { GST_BIN_MAKE ($$, "thread", NULL, $2); }
|
||||
| '(' assignments '}' { GST_BIN_MAKE ($$, "thread", NULL, $2); }
|
||||
| BINREF assignments ')' { GST_BIN_MAKE ($$, $1, NULL, $2);
|
||||
gst_parse_strfree ($1);
|
||||
}
|
||||
| '{' assignments error '}' { GST_BIN_MAKE ($$, "thread", NULL, $2); }
|
||||
| '(' assignments error '}' { GST_BIN_MAKE ($$, "thread", NULL, $2); }
|
||||
| BINREF assignments error ')' { GST_BIN_MAKE ($$, $1, NULL, $2);
|
||||
gst_parse_strfree ($1);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue