diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-21 19:09:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-21 19:09:12 +0100 |
| commit | c0caf7e81493f5d9d4acd013892b651ab39be450 (patch) | |
| tree | 382ed15901eab689aacd1bfb41a645f85b5fdc19 | |
| parent | c8a0a2e990ba80fefe96c3aa6e9ed46bc6001e3a (diff) | |
| parent | dd249245d012c1eceb57c166e256fc95e74f4bb1 (diff) | |
| download | ffmpeg-c0caf7e81493f5d9d4acd013892b651ab39be450.tar.gz | |
Merge commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1'
* commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1':
filter docs: reference scale and fps filters
Conflicts:
doc/filters.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/filters.texi | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index a3a76368cd..8329bf0c07 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -198,7 +198,7 @@ In a complete filterchain all the unlabelled filter input and output pads must be connected. A filtergraph is considered valid if all the filter input and output pads of all the filterchains are connected. -Libavfilter will automatically insert scale filters where format +Libavfilter will automatically insert @ref{scale} filters where format conversion is required. It is possible to specify swscale flags for those automatically inserted scalers by prepending @code{sws_flags=@var{flags};} @@ -4314,6 +4314,7 @@ format=pix_fmts=yuv420p|yuv444p|yuv410p @end example @end itemize +@anchor{fps} @section fps Convert the video to specified constant frame rate by duplicating or dropping @@ -6671,6 +6672,7 @@ must be a value in the 0.1-100.0 range. Each chroma option value, if not explicitly specified, is set to the corresponding luma option value. +@anchor{scale} @section scale Scale (resize) the input video, using the libswscale library. |