From 1bd9b960ba74d4512edbbdaa84ae747f0d9007de Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 23 Sep 2016 16:26:56 +0200 Subject: [PATCH] tests/fate/ffmpeg: Remove dead automatic remove extradata test update the keyframe test Found-by: jamrial Signed-off-by: Michael Niedermayer --- tests/fate/ffmpeg.mak | 7 ++----- tests/ref/fate/ffmpeg-bsf-remove-a | 33 ------------------------------ 2 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 tests/ref/fate/ffmpeg-bsf-remove-a diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index e913ca88e2..da6d5decda 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -89,16 +89,13 @@ fate-adtstoasc_ticket3715: $(TARGET_SAMPLES)/aac/foo.aac fate-adtstoasc_ticket3715: CMD = transcode "aac" $(TARGET_SAMPLES)/aac/foo.aac\ mov "-c copy -bsf:a aac_adtstoasc" "-codec copy" -FATE_SAMPLES_FFMPEG-$(call ALLYES, MPEGPS_DEMUXER AVI_MUXER REMOVE_EXTRADATA_BSF) += fate-ffmpeg-bsf-remove-k fate-ffmpeg-bsf-remove-a fate-ffmpeg-bsf-remove-r fate-ffmpeg-bsf-remove-e +FATE_SAMPLES_FFMPEG-$(call ALLYES, MPEGPS_DEMUXER AVI_MUXER REMOVE_EXTRADATA_BSF) += fate-ffmpeg-bsf-remove-k fate-ffmpeg-bsf-remove-r fate-ffmpeg-bsf-remove-e fate-ffmpeg-bsf-remove-k: $(TARGET_SAMPLES)/mpeg2/matrixbench_mpeg2.lq1.mpg fate-ffmpeg-bsf-remove-k: CMD = transcode "mpeg" $(TARGET_SAMPLES)/mpeg2/matrixbench_mpeg2.lq1.mpg\ avi "-vbsf remove_extra=k" "-codec copy" -fate-ffmpeg-bsf-remove-a: $(TARGET_SAMPLES)/mpeg2/matrixbench_mpeg2.lq1.mpg -fate-ffmpeg-bsf-remove-a: CMD = transcode "mpeg" $(TARGET_SAMPLES)/mpeg2/matrixbench_mpeg2.lq1.mpg\ - avi "-vbsf remove_extra=a" "-codec copy" fate-ffmpeg-bsf-remove-r: $(TARGET_SAMPLES)/mpeg2/matrixbench_mpeg2.lq1.mpg fate-ffmpeg-bsf-remove-r: CMD = transcode "mpeg" $(TARGET_SAMPLES)/mpeg2/matrixbench_mpeg2.lq1.mpg\ - avi "-vbsf remove_extra=r" "-codec copy" + avi "-vbsf remove_extra=keyframe" "-codec copy" fate-ffmpeg-bsf-remove-e: $(TARGET_SAMPLES)/mpeg2/matrixbench_mpeg2.lq1.mpg fate-ffmpeg-bsf-remove-e: CMD = transcode "mpeg" $(TARGET_SAMPLES)/mpeg2/matrixbench_mpeg2.lq1.mpg\ avi "-vbsf remove_extra=e" "-codec copy" diff --git a/tests/ref/fate/ffmpeg-bsf-remove-a b/tests/ref/fate/ffmpeg-bsf-remove-a deleted file mode 100644 index 8d362d3ff1..0000000000 --- a/tests/ref/fate/ffmpeg-bsf-remove-a +++ /dev/null @@ -1,33 +0,0 @@ -6196f1d6b59d16c045de627221d8685f *tests/data/fate/ffmpeg-bsf-remove-a.avi -130072 tests/data/fate/ffmpeg-bsf-remove-a.avi -#extradata 0: 30, 0x4a4d065a -#tb 0: 1/25 -#media_type 0: video -#codec_id 0: mpeg4 -#dimensions 0: 716x236 -#sar 0: 1/1 -0, 0, 0, 1, 20194, 0x174f64ac -0, 1, 1, 1, 17878, 0xc081a405, F=0x0 -0, 2, 2, 1, 22723, 0x60935d28, F=0x0 -0, 3, 3, 1, 18655, 0xe5c33ada, F=0x0 -0, 4, 4, 1, 12928, 0x84d6a9d7, F=0x0 -0, 5, 5, 1, 4788, 0xbf9e1939, F=0x0 -0, 6, 6, 1, 3160, 0x867423c7, F=0x0 -0, 7, 7, 1, 2049, 0x523ffd85, F=0x0 -0, 8, 8, 1, 1440, 0x363ff725, F=0x0 -0, 9, 9, 1, 1300, 0x0d3c9c74, F=0x0 -0, 10, 10, 1, 1081, 0xbfb0365c, F=0x0 -0, 11, 11, 1, 1011, 0x9d310f90, F=0x0 -0, 12, 12, 1, 2543, 0x64500a0f -0, 13, 13, 1, 881, 0x7492d262, F=0x0 -0, 14, 14, 1, 896, 0x1ff1d335, F=0x0 -0, 15, 15, 1, 973, 0x72c1fc04, F=0x0 -0, 16, 16, 1, 1075, 0xa5881d73, F=0x0 -0, 17, 17, 1, 933, 0xf0aae974, F=0x0 -0, 18, 18, 1, 1079, 0xbdce1b40, F=0x0 -0, 19, 19, 1, 964, 0x323fe4ab, F=0x0 -0, 20, 20, 1, 1015, 0x78a4fe96, F=0x0 -0, 21, 21, 1, 990, 0x9cd4ff25, F=0x0 -0, 22, 22, 1, 1093, 0x98712e2e, F=0x0 -0, 23, 23, 1, 1200, 0x37957156, F=0x0 -0, 24, 24, 1, 2881, 0xbb1feefb