virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

Merge commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1'

Browse Source 
* commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1':
  filter docs: reference scale and fps filters

Conflicts:
	doc/filters.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-21 19:09:12 +01:00
commit c0caf7e814
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/filters.texi
View File

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