diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-17 15:27:27 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-17 15:27:27 +0100 |
| commit | 1398ded7a77b2057a3e9983e3df512855b7ff0eb (patch) | |
| tree | b49506eaabe8b8cdf2992cdd2c5f28b9378f03ba /tests | |
| parent | 2f1a539d4b905a418aec4b420adcb7648eba5c64 (diff) | |
| parent | cbbb404055877e3beb9890ffe22784a6a100963e (diff) | |
| download | ffmpeg-1398ded7a77b2057a3e9983e3df512855b7ff0eb.tar.gz | |
Merge commit 'cbbb404055877e3beb9890ffe22784a6a100963e'
* commit 'cbbb404055877e3beb9890ffe22784a6a100963e':
fate: Restore order of h264 entries
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/h264.mak | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index f8ef3f471f..76819435f2 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -412,17 +412,17 @@ fate-h264-conformance-sva_nl2_e: CMD = framecrc -vsync drop -i fate-h264-bsf-mp4toannexb: CMD = md5 -i $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 -vcodec copy -f h264 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-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-lossless: CMD = framecrc -i $(TARGET_SAMPLES)/h264/lossless.h264 -fate-h264-direct-bff: CMD = framecrc -i $(TARGET_SAMPLES)/h264/direct-bff.mkv 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.95 fate-h264-skip-nokey: CMD = framecrc -skip_frame nokey -i $(TARGET_SAMPLES)/h264/h264_intra_first-small.ts fate-h264-skip-nointra: CMD = framecrc -skip_frame nointra -i $(TARGET_SAMPLES)/h264/h264_intra_first-small.ts 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 fate-h264-unescaped-extradata: CMD = framecrc -i $(TARGET_SAMPLES)/h264/unescaped_extradata.mp4 -an -frames 10 fate-h264-3386: CMD = framecrc -i $(TARGET_SAMPLES)/h264/bbc2.sample.h264 |