summaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-05-14 08:14:21 +0200
committerAnton Khirnov <anton@khirnov.net>2013-05-15 07:46:04 +0200
commitffba2053edfc177d217bf4a95edf51cd0fc40753 (patch)
tree4cc6f9fe39177f9304b229f34a38d06a238161ff /libavfilter
parent096696ef0dd391d9430376d1444c1a3cde9171fd (diff)
downloadffmpeg-streaming-ffba2053edfc177d217bf4a95edf51cd0fc40753.zip
ffmpeg-streaming-ffba2053edfc177d217bf4a95edf51cd0fc40753.tar.gz
lavfi: fix compatibility code for old vf_scale options syntax
Currently it would incorrectly trigger on a string that contains a '=' but does not contain a ':', e.g. flags=<flags>.
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/avfilter.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 8f028e1..e2062a1 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -555,7 +555,7 @@ int avfilter_init_str(AVFilterContext *filter, const char *args)
#if FF_API_OLD_FILTER_OPTS
if (!strcmp(filter->filter->name, "scale") &&
- strchr(args, ':') < strchr(args, '=')) {
+ strchr(args, ':') && strchr(args, ':') < strchr(args, '=')) {
/* old w:h:flags=<flags> syntax */
char *copy = av_strdup(args);
char *p;
OpenPOWER on IntegriCloud