summaryrefslogtreecommitdiff
path: root/libavfilter
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2009-12-11 20:02:10 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2009-12-11 20:02:10 +0000
commit15a316c0146106ac627fa67ddaa639f75a4eccce (patch)
tree3f4945f33e9ddadc3ce9dac0637e487c5c604b75 /libavfilter
parentcfac91fec3acfac8dc6b8d6a658abb98d2823002 (diff)
Make parse_filter() parsing more robust.
Add ';' and '\n' to the terminating characters for the name of a filter, and ';' to the terminating characters for its args. Originally committed as revision 20800 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/graphparser.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
index 592934c6ff..c4a3bdf8fd 100644
--- a/libavfilter/graphparser.c
+++ b/libavfilter/graphparser.c
@@ -120,12 +120,12 @@ static AVFilterContext *parse_filter(const char **buf, AVFilterGraph *graph,
int index, AVClass *log_ctx)
{
char *opts = NULL;
- char *name = av_get_token(buf, "=,[");
+ char *name = av_get_token(buf, "=,;[\n");
AVFilterContext *ret;
if(**buf == '=') {
(*buf)++;
- opts = av_get_token(buf, "[],\n");
+ opts = av_get_token(buf, "[],;\n");
}
ret = create_filter(graph, index, name, opts, log_ctx);