diff options
| author | Vitor Sessak <vitor1001@gmail.com> | 2008-05-24 20:39:22 +0000 |
|---|---|---|
| committer | Vitor Sessak <vitor1001@gmail.com> | 2008-05-24 20:39:22 +0000 |
| commit | d7ff2297184e455cca90cc830d1a8be2bb6f0f2b (patch) | |
| tree | d328b032ef90a8f76caa3874d986d7203cd9fffe | |
| parent | 92973a04f0e566576ad896dff39e23098ef926ae (diff) | |
| download | ffmpeg-d7ff2297184e455cca90cc830d1a8be2bb6f0f2b.tar.gz | |
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
| -rw-r--r-- | libavfilter/graphparser.c | 12 | ||||
| -rw-r--r-- | libavfilter/graphparser.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index 2f0dd3e959..2007b6241f 100644 --- 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 4f494aff41..7dda160cd5 100644 --- 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 */ |