diff options
| -rw-r--r-- | doc/avconv.texi | 13 | ||||
| -rw-r--r-- | tests/fate/h264.mak | 2 | ||||
| -rw-r--r-- | tests/fate/video.mak | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/doc/avconv.texi b/doc/avconv.texi index 9f2f295bd0..002dba3184 100644 --- a/doc/avconv.texi +++ b/doc/avconv.texi @@ -343,7 +343,8 @@ avconv -i myfile.avi -target vcd -bf 2 /tmp/vcd.mpg @end example @item -dframes @var{number} (@emph{output}) -Set the number of data frames to record. This is an alias for @code{-frames:d}. +Set the number of data frames to record. This is an obsolete alias for +@code{-frames:d}, which you should use instead. @item -frames[:@var{stream_specifier}] @var{framecount} (@emph{output,per-stream}) Stop writing to the stream after @var{framecount} frames. @@ -414,7 +415,8 @@ Disable automatically rotating video based on file metadata. @table @option @item -vframes @var{number} (@emph{output}) -Set the number of video frames to record. This is an alias for @code{-frames:v}. +Set the number of video frames to record. This is an obsolete alias for +@code{-frames:v}, which you should use instead. @item -r[:@var{stream_specifier}] @var{fps} (@emph{input/output,per-stream}) Set frame rate (Hz value, fraction or abbreviation). @@ -664,7 +666,8 @@ List all hardware acceleration methods supported in this build of avconv. @table @option @item -aframes @var{number} (@emph{output}) -Set the number of audio frames to record. This is an alias for @code{-frames:a}. +Set the number of audio frames to record. This is an obsolete alias for +@code{-frames:a}, which you should use instead. @item -ar[:@var{stream_specifier}] @var{freq} (@emph{input/output,per-stream}) Set the audio sampling frequency. For output streams it is set by default to the frequency of the corresponding input stream. For input @@ -1164,8 +1167,8 @@ output them in files named @file{foo-001.jpeg}, @file{foo-002.jpeg}, etc. Images will be rescaled to fit the new WxH values. If you want to extract just a limited number of frames, you can use the -above command in combination with the -vframes or -t option, or in -combination with -ss to start extracting from a certain point in time. +above command in combination with the @code{-frames:v} or @code{-t} option, +or in combination with -ss to start extracting from a certain point in time. For creating a video from many images: @example diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index ff1dd15109..24e0c9c5cc 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -385,7 +385,7 @@ fate-h264-bsf-mp4toannexb: CMD = md5 -i $(TARGET_SAMPLES) fate-h264-crop-to-container: CMD = framemd5 -i $(TARGET_SAMPLES)/h264/crop-to-container-dims-canon.mov fate-h264-direct-bff: CMD = framecrc -i $(TARGET_SAMPLES)/h264/direct-bff.mkv fate-h264-extreme-plane-pred: CMD = framemd5 -i $(TARGET_SAMPLES)/h264/extreme-plane-pred.h264 -fate-h264-interlace-crop: CMD = framecrc -i $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 -vframes 3 +fate-h264-interlace-crop: CMD = framecrc -i $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 -frames:v 3 fate-h264-intra-refresh-recovery: CMD = framecrc -i $(TARGET_SAMPLES)/h264/intra_refresh.h264 -frames:v 10 fate-h264-invalid-ref-mod: CMD = framecrc -i $(TARGET_SAMPLES)/h264/h264refframeregression.mp4 -an -frames 10 -pix_fmt yuv420p10le fate-h264-lossless: CMD = framecrc -i $(TARGET_SAMPLES)/h264/lossless.h264 diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 18366e836f..bd5d3ca3b2 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -219,10 +219,10 @@ FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, MJPEGB) += fate-mjpegb fate-mjpegb: CMD = framecrc -idct simple -fflags +bitexact -i $(TARGET_SAMPLES)/mjpegb/mjpegb_part.mov -an FATE_SAMPLES_AVCONV-$(call DEMDEC, MVI, MOTIONPIXELS) += fate-motionpixels -fate-motionpixels: CMD = framecrc -i $(TARGET_SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24 -vframes 111 +fate-motionpixels: CMD = framecrc -i $(TARGET_SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24 -frames:v 111 FATE_SAMPLES_AVCONV-$(call DEMDEC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc -fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an -vframes 30 +fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an -frames:v 30 FATE_SAMPLES_AVCONV-$(call DEMDEC, MV, MVC1) += fate-mv-mvc1 fate-mv-mvc1: CMD = framecrc -i $(TARGET_SAMPLES)/mv/posture.mv -an -frames 25 -pix_fmt rgb555le |