RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-11 09:07:29 +00:00
Code Issues Projects Releases Wiki Activity

Use '[' and ']' for label naming

Browse Source 
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
This commit is contained in:
Vitor Sessak 2008-05-24 20:39:22 +00:00
parent 92973a04f0
commit d7ff229718
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavfilter/graphparser.c
View File

@ -117,8 +117,8 @@ static char *consume_string(const char **buf)
if(*in) in++; if(*in) in++;
break; break;
case 0: case 0:
case ')': case ']':
case '(': case '[':
case '=': case '=':
case ',': case ',':
*out++= 0; *out++= 0;
@ -146,7 +146,7 @@ static void parse_link_name(const char **buf, char **name)
if (!*name[0]) if (!*name[0])
goto fail; goto fail;
if (*(*buf)++ != ')') if (*(*buf)++ != ']')
goto fail; goto fail;
return; return;
@ -211,7 +211,7 @@ static int parse_inouts(const char **buf, AVFilterInOut **inout, int firstpad,
enum LinkType type, AVFilterContext *filter) enum LinkType type, AVFilterContext *filter)
{ {
int pad = firstpad; int pad = firstpad;
while (**buf == '(') { while (**buf == '[') {
AVFilterInOut *inoutn = av_malloc(sizeof(AVFilterInOut)); AVFilterInOut *inoutn = av_malloc(sizeof(AVFilterInOut));
parse_link_name(buf, &inoutn->name); parse_link_name(buf, &inoutn->name);
inoutn->type = type; 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) static const char *skip_inouts(const char *buf)
{ {
while (*buf == '(') { while (*buf == '[') {
buf += strcspn(buf, ")"); buf += strcspn(buf, "]");
buf++; buf++;
} }
return buf; return buf;

2
libavfilter/graphparser.h
View File

@ -35,6 +35,6 @@
* @param inpad pad index of the output * @param inpad pad index of the output
* @return zero on success, -1 on error * @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 */ #endif /* FFMPEG_GRAPHPARSER_H */