Merge commit '72fbc968'

* commit '72fbc968':
  avconv: use current syntax for the scale filter
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg_filter.c

@@ -354,7 +354,7 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter,
         char args[255];
         AVFilterContext *filter;
 
-        snprintf(args, sizeof(args), "%d:%d:flags=0x%X",
+        snprintf(args, sizeof(args), "%d:%d:0x%X",
                  codec->width,
                  codec->height,
                  (unsigned)ost->sws_flags);