Use '[' and ']' for label naming

Commited in SoC by Vitor Sessak on 2008-04-06 19:02:56

Originally committed as revision 13297 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
index 2f0dd3e959f32ffa4f4b4a2aaa25f5ffbf3dc4e7..2007b6241f3d93bf5534f21c2239627831ec173d 100644 (file)
--- a/libavfilter/graphparser.c
+++ b/libavfilter/graphparser.c
@@ -117,8 +117,8 @@ static char *consume_string(const char **buf)
             if(*in) in++;
             break;
         case 0:
-        case ')':
-        case '(':
+        case ']':
+        case '[':
         case '=':
         case ',':
             *out++= 0;
@@ -146,7 +146,7 @@ static void parse_link_name(const char **buf, char **name)
     if (!*name[0])
         goto fail;
 
-    if (*(*buf)++ != ')')
+    if (*(*buf)++ != ']')
         goto fail;
 
     return;
@@ -211,7 +211,7 @@ static int parse_inouts(const char **buf, AVFilterInOut **inout, int firstpad,
                         enum LinkType type, AVFilterContext *filter)
 {
     int pad = firstpad;
-    while (**buf == '(') {
+    while (**buf == '[') {
         AVFilterInOut *inoutn = av_malloc(sizeof(AVFilterInOut));
         parse_link_name(buf, &inoutn->name);
         inoutn->type = type;
@@ -225,8 +225,8 @@ static int parse_inouts(const char **buf, AVFilterInOut **inout, int firstpad,
 
 static const char *skip_inouts(const char *buf)
 {
-    while (*buf == '(') {
-        buf += strcspn(buf, ")");
+    while (*buf == '[') {
+        buf += strcspn(buf, "]");
         buf++;
     }
     return buf;

diff --git a/libavfilter/graphparser.h b/libavfilter/graphparser.h
index 4f494aff4125ab0d75b976b00ab3a3a4293d7caf..7dda160cd5864d1907f4fd4780f59cc057dc7132 100644 (file)
--- a/libavfilter/graphparser.h
+++ b/libavfilter/graphparser.h
@@ -35,6 +35,6 @@
  * @param inpad   pad index of the output
  * @return        zero on success, -1 on error
  */
-int avfilter_graph_parse_chain(AVFilterGraph *graph, const char *filters, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad);
+int avfilter_parse_graph(AVFilterGraph *graph, const char *filters, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad);
 
 #endif  /* FFMPEG_GRAPHPARSER_H */