[FFmpeg-cvslog] lavfi: fix compatibility code for old vf_scale options syntax

Anton Khirnov git at videolan.org
Wed May 15 10:38:45 CEST 2013


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue May 14 08:14:21 2013 +0200| [ffba2053edfc177d217bf4a95edf51cd0fc40753] | committer: Anton Khirnov

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>.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ffba2053edfc177d217bf4a95edf51cd0fc40753
---

 libavfilter/avfilter.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;



More information about the ffmpeg-cvslog mailing list