[FFmpeg-devel] [PATCH] ffplay: extend documentation for the -vf option

[Stefano Sabatini]

On date Sunday 2013-01-13 15:38:09 +0100, Marton Balint encoded:
> 
> On Sun, 13 Jan 2013, Stefano Sabatini wrote:
> 
> >In particular, make it consistent with the ffmpeg docs.
> >---
> >doc/ffplay.texi |   11 ++++++++---
> >ffplay.c        |    2 +-
> >2 files changed, 9 insertions(+), 4 deletions(-)
> >
> >diff --git a/doc/ffplay.texi b/doc/ffplay.texi
> >index 0703a54..2b37652 100644
> >--- a/doc/ffplay.texi
> >+++ b/doc/ffplay.texi
> >@@ -74,10 +74,15 @@ You can interactively cycle through the available show modes by
> >pressing the key @key{w}.
> >
> >@item -vf @var{filter_graph}
> >+Create the filter graph specified by @var{filter_graph} and use it to
> >+filter the stream.
> >+
> >@var{filter_graph} is a description of the filter graph to apply to
> >-the input video.
> >-Use the option "-filters" to show all the available filters (including
> >-also sources and sinks).
> >+the stream, and must have a single video input and a single video
> >+output. In the filter graph, the input is associated to the label
> >+ at code{in}, and the output to the label @code{out}. See the
> >+ffmpeg-filters manual for more information about the filtergraph
> >+syntax.
> >
> >@item -i @var{input_file}
> >Read @var{input_file}.
> >diff --git a/ffplay.c b/ffplay.c
> >index f300f7e..b23cec2 100644
> >--- a/ffplay.c
> >+++ b/ffplay.c
> >@@ -3241,7 +3241,7 @@ static const OptionDef options[] = {
> >    { "infbuf", OPT_BOOL | OPT_EXPERT, { &infinite_buffer }, "don't limit the input buffer size (useful with realtime streams)", "" },
> >    { "window_title", OPT_STRING | HAS_ARG, { &window_title }, "set window title", "window title" },
> >#if CONFIG_AVFILTER
> >-    { "vf", OPT_STRING | HAS_ARG, { &vfilters }, "video filters", "filter list" },
> >+    { "vf", OPT_STRING | HAS_ARG, { &vfilters }, "set video filters", "filter_graph" },
> >#endif
> >    { "rdftspeed", OPT_INT | HAS_ARG| OPT_AUDIO | OPT_EXPERT, { &rdftspeed }, "rdft speed", "msecs" },
> >    { "showmode", HAS_ARG, { .func_arg = opt_show_mode}, "select show mode (0 = video, 1 = waves, 2 = RDFT)", "mode" },
> >--
> >1.7.9.5
> 
> LGTM, thanks.

Applied.
-- 
FFmpeg = Fascinating and Fascinating Mournful Programmable Earthshaking Gymnast