diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-24 11:37:44 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-24 11:40:35 +0100 |
| commit | 71d541751ef10255ec8b179b014246e69a9c060b (patch) | |
| tree | 91471868e9c4339f46aaecc9a8d74ce5ebe038c5 /tests/fate/h264.mak | |
| parent | 30ac66abf0995c3a9a6c5370d357e51268b1b69f (diff) | |
| parent | 043b0b9fb1481053b712d06d2c5b772f1845b72b (diff) | |
| download | ffmpeg-71d541751ef10255ec8b179b014246e69a9c060b.tar.gz | |
Merge commit '043b0b9fb1481053b712d06d2c5b772f1845b72b'
* commit '043b0b9fb1481053b712d06d2c5b772f1845b72b':
Replace leftover uses of -aframes|-dframes|-vframes with -frames:a|d|v
The merge also includes all our own occurences.
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'tests/fate/h264.mak')
| -rw-r--r-- | tests/fate/h264.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index 52b6a98785..2f50380f4f 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -424,7 +424,7 @@ fate-h264-crop-to-container: CMD = framemd5 -i $(TARGET_SAM fate-h264-direct-bff: CMD = framecrc -i $(TARGET_SAMPLES)/h264/direct-bff.mkv fate-h264-extradata-reload: CMD = framemd5 -i $(TARGET_SAMPLES)/h264/extradata-reload-multi-stsd.mov 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-brokensps-2580: CMD = framecrc -i $(TARGET_SAMPLES)/h264/brokensps.flv -vf format=yuv420p,scale=w=192:h=144 -sws_flags bitexact+bilinear fate-h264-xavc-4389: CMD = framecrc -i $(TARGET_SAMPLES)/h264/SonyXAVC_LongGOP_green_pixelation_early_Frames.MXF -pix_fmt yuv422p10le fate-h264-attachment-631: CMD = framecrc -i $(TARGET_SAMPLES)/h264/attachment631-small.mp4 -an -max_error_rate 0.96 |