diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-27 02:33:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-27 04:35:35 +0100 |
| commit | 574dcb5baf26c7cce755b51e445ca7109f0f1260 (patch) | |
| tree | 1a2fd2363b4b0b9a50ed7f2dd9f2b3aff08b72eb /doc | |
| parent | 59affed23c3a30b85c006c45f9e5d3aa8ce50741 (diff) | |
| parent | 7929e22bdea3bc40735d31ed7ddbf047732c3b9f (diff) | |
| download | ffmpeg-574dcb5baf26c7cce755b51e445ca7109f0f1260.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: don't guess r_frame_rate from either stream or codec timebase.
avconv: set discard on input streams automatically.
Fix parser not to clobber has_b_frames when extradata is set.
lavf: don't set codec timebase in avformat_find_stream_info().
avconv: saner output video timebase.
rawdec: set timebase to 1/fps.
avconv: refactor vsync code.
FATE: remove a bunch of useless -vsync 0
cdxl: bit line plane arrangement support
cdxl: remove early check for bpp
cdxl: set pix_fmt PAL8 only if palette is available
Conflicts:
ffmpeg.c
libavcodec/h264_parser.c
libavformat/rawdec.c
tests/fate/demux.mak
tests/fate/ea.mak
tests/fate/h264.mak
tests/fate/prores.mak
tests/fate/video.mak
tests/ref/fate/bethsoft-vid
tests/ref/fate/creatureshock-avs
tests/ref/fate/ea-cmv
tests/ref/fate/interplay-mve-16bit
tests/ref/fate/interplay-mve-8bit
tests/ref/fate/nuv
tests/ref/fate/prores-alpha
tests/ref/fate/qtrle-16bit
tests/ref/fate/qtrle-1bit
tests/ref/fate/real-rv40
tests/ref/fate/rpza
tests/ref/fate/wmv8-drm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ffmpeg.texi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 128aceccb0..3f3cbeb83e 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -279,7 +279,8 @@ attachments. @item -vframes @var{number} (@emph{output}) Set the number of video frames to record. This is an alias for @code{-frames:v}. @item -r[:@var{stream_specifier}] @var{fps} (@emph{input/output,per-stream}) -Set frame rate (Hz value, fraction or abbreviation), (default = 25). +Set frame rate (Hz value, fraction or abbreviation), (default = 25). For output +streams implies @code{-vsync cfr}. @item -s[:@var{stream_specifier}] @var{size} (@emph{input/output,per-stream}) Set frame size. The format is @samp{wxh} (default - same as source). The following abbreviations are recognized: |