[FFmpeg-cvslog] r23100 - in trunk: doc/libavfilter.texi ffmpeg.c

[bcoudurier]

Author: bcoudurier
Date: Wed May 12 03:47:14 2010
New Revision: 23100

Log:
rename -vfilters cli option to -vf

Modified:
   trunk/doc/libavfilter.texi
   trunk/ffmpeg.c

Modified: trunk/doc/libavfilter.texi
==============================================================================
--- trunk/doc/libavfilter.texi	Tue May 11 23:31:54 2010	(r23099)
+++ trunk/doc/libavfilter.texi	Wed May 12 03:47:14 2010	(r23100)
@@ -47,14 +47,14 @@ and the vflip filter before merging it b
 overlaying it on top. You can use the following command to achieve this:
 
 @example
-./ffmpeg -i in.avi -s 240x320 -vfilters "[in] split [T1], fifo, [T2] overlay= 0:240 [out]; [T1] fifo, crop=0:0:-1:240, vflip [T2]
+./ffmpeg -i in.avi -s 240x320 -vf "[in] split [T1], fifo, [T2] overlay= 0:240 [out]; [T1] fifo, crop=0:0:-1:240, vflip [T2]
 @end example
 
 where input_video.avi has a vertical resolution of 480 pixels. The
 result will be that in output the top half of the video is mirrored
 onto the bottom half.
 
-Video filters are loaded using the @var{-vfilters} option passed to
+Video filters are loaded using the @var{-vf} option passed to
 ffmpeg or to ffplay. Filters in the same linear chain are separated by
 commas. In our example, @var{split, fifo, overlay} are in one linear
 chain, and @var{fifo, crop, vflip} are in another. The points where
@@ -113,7 +113,7 @@ Below is a description of the currently 
 Crop the input video to @var{x}:@var{y}:@var{width}:@var{height}.
 
 @example
-./ffmpeg -i in.avi -vfilters "crop=0:0:0:240" out.avi
+./ffmpeg -i in.avi -vf "crop=0:0:0:240" out.avi
 @end example
 
 @var{x} and @var{y} specify the position of the top-left corner of the
@@ -151,7 +151,7 @@ for example ``yuv420p:monow:rgb24''.
 The following command:
 
 @example
-./ffmpeg -i in.avi -vfilters "format=yuv420p" out.avi
+./ffmpeg -i in.avi -vf "format=yuv420p" out.avi
 @end example
 
 will convert the input video to the format ``yuv420p''.
@@ -167,7 +167,7 @@ for example ``yuv420p:monow:rgb24''.
 The following command:
 
 @example
-./ffmpeg -i in.avi -vfilters "noformat=yuv420p, vflip" out.avi
+./ffmpeg -i in.avi -vf "noformat=yuv420p, vflip" out.avi
 @end example
 
 will make libavfilter use a format different from ``yuv420p'' for the
@@ -219,7 +219,7 @@ Scale the input video to @var{width}:@va
 For example the command:
 
 @example
-./ffmpeg -i in.avi -vfilters "scale=200:100" out.avi
+./ffmpeg -i in.avi -vf "scale=200:100" out.avi
 @end example
 
 will scale the input video to a size of 200x100.
@@ -243,7 +243,7 @@ Pass the images of input video on to nex
 slices.
 
 @example
-./ffmpeg -i in.avi -vfilters "slicify=32" out.avi
+./ffmpeg -i in.avi -vf "slicify=32" out.avi
 @end example
 
 The filter accepts the slice height as parameter. If the parameter is
@@ -302,7 +302,7 @@ unsharp=7:7:2.5
 unsharp=7:7:-2:7:7:-2
 
 # Use the default values with @command{ffmpeg}
-./ffmpeg -i in.avi -vfilters "unsharp" out.mp4
+./ffmpeg -i in.avi -vf "unsharp" out.mp4
 @end example
 
 @section vflip
@@ -310,7 +310,7 @@ unsharp=7:7:-2:7:7:-2
 Flip the input video vertically.
 
 @example
-./ffmpeg -i in.avi -vfilters "vflip" out.avi
+./ffmpeg -i in.avi -vf "vflip" out.avi
 @end example
 
 @chapter Available video sources

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Tue May 11 23:31:54 2010	(r23099)
+++ trunk/ffmpeg.c	Wed May 12 03:47:14 2010	(r23100)
@@ -2819,7 +2819,7 @@ static void opt_frame_size(const char *a
 }
 
 static void opt_pad(const char *arg) {
-    fprintf(stderr, "Please use vfilters=pad\n");
+    fprintf(stderr, "Please use vf=pad\n");
     av_exit(1);
 }
 
@@ -4197,7 +4197,7 @@ static const OptionDef options[] = {
     { "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" },
     { "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" },
 #if CONFIG_AVFILTER
-    { "vfilters", OPT_STRING | HAS_ARG, {(void*)&vfilters}, "video filters", "filter list" },
+    { "vf", OPT_STRING | HAS_ARG, {(void*)&vfilters}, "video filters", "filter list" },
 #endif
     { "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_intra_matrix}, "specify intra matrix coeffs", "matrix" },
     { "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_inter_matrix}, "specify inter matrix coeffs", "matrix" },