ffmpeg | branch: master | Hendrik Leppkes <[email protected]> | Sun Jun 26 15:41:49 2016 +0200| [cd52ec2337ae0d78c53ed32602a100a67b829fe4] | committer: Hendrik Leppkes
Merge commit 'f5c43884190be094749acfba104e3eab98d8ff1e' * commit 'f5c43884190be094749acfba104e3eab98d8ff1e': FATE: drop the audio stream from the dxtory test Merged-by: Hendrik Leppkes <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd52ec2337ae0d78c53ed32602a100a67b829fe4 --- tests/fate/screen.mak | 2 +- tests/ref/fate/dxtory | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak index deb8465..eb70ea2 100644 --- a/tests/fate/screen.mak +++ b/tests/fate/screen.mak @@ -3,7 +3,7 @@ FATE_SCREEN-$(call DEMDEC, AVI, CSCD) += fate-cscd fate-cscd: CMD = framecrc -i $(TARGET_SAMPLES)/CSCD/sample_video.avi -an -pix_fmt rgb24 FATE_SCREEN-$(call DEMDEC, AVI, DXTORY) += fate-dxtory -fate-dxtory: CMD = framecrc -i $(TARGET_SAMPLES)/dxtory/dxtory_mic.avi +fate-dxtory: CMD = framecrc -i $(TARGET_SAMPLES)/dxtory/dxtory_mic.avi -an FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, FIC) += fate-fic-avi fate-fic-avi: CMD = framecrc -i $(TARGET_SAMPLES)/fic/fic-partial-2MB.avi -an diff --git a/tests/ref/fate/dxtory b/tests/ref/fate/dxtory index bda8872..4ebcaf6 100644 --- a/tests/ref/fate/dxtory +++ b/tests/ref/fate/dxtory @@ -3,9 +3,4 @@ #codec_id 0: rawvideo #dimensions 0: 1280x720 #sar 0: 0/1 -#tb 1: 1/48000 -#media_type 1: audio -#codec_id 1: pcm_s16le -#sample_rate 1: 48000 -#channel_layout 1: 3 0, 0, 0, 1, 1382400, 0x44373645 ====================================================================== diff --cc tests/fate/screen.mak index deb8465,7e91f19..eb70ea2 --- a/tests/fate/screen.mak +++ b/tests/fate/screen.mak @@@ -1,9 -1,9 +1,9 @@@ # FIXME dropped frames in this test because of coarse timebase -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, CSCD) += fate-cscd +FATE_SCREEN-$(call DEMDEC, AVI, CSCD) += fate-cscd fate-cscd: CMD = framecrc -i $(TARGET_SAMPLES)/CSCD/sample_video.avi -an -pix_fmt rgb24 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, DXTORY) += fate-dxtory +FATE_SCREEN-$(call DEMDEC, AVI, DXTORY) += fate-dxtory - fate-dxtory: CMD = framecrc -i $(TARGET_SAMPLES)/dxtory/dxtory_mic.avi + fate-dxtory: CMD = framecrc -i $(TARGET_SAMPLES)/dxtory/dxtory_mic.avi -an FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, FIC) += fate-fic-avi fate-fic-avi: CMD = framecrc -i $(TARGET_SAMPLES)/fic/fic-partial-2MB.avi -an diff --cc tests/ref/fate/dxtory index bda8872,8cee5ef..4ebcaf6 --- a/tests/ref/fate/dxtory +++ b/tests/ref/fate/dxtory @@@ -1,11 -1,2 +1,6 @@@ #tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 1280x720 +#sar 0: 0/1 - #tb 1: 1/48000 - #media_type 1: audio - #codec_id 1: pcm_s16le - #sample_rate 1: 48000 - #channel_layout 1: 3 0, 0, 0, 1, 1382400, 0x44373645 _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
