diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 15:41:49 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 15:41:49 +0200 |
| commit | cd52ec2337ae0d78c53ed32602a100a67b829fe4 (patch) | |
| tree | 2fa58fae21216672317f25933ba8f3da0b8fc17a /tests | |
| parent | 7fe7cdca3665b8ab1863f8f79e6881c1c4d1b630 (diff) | |
| parent | f5c43884190be094749acfba104e3eab98d8ff1e (diff) | |
| download | ffmpeg-cd52ec2337ae0d78c53ed32602a100a67b829fe4.tar.gz | |
Merge commit 'f5c43884190be094749acfba104e3eab98d8ff1e'
* commit 'f5c43884190be094749acfba104e3eab98d8ff1e':
FATE: drop the audio stream from the dxtory test
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/screen.mak | 2 | ||||
| -rw-r--r-- | tests/ref/fate/dxtory | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak index deb84652a2..eb70ea2cba 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 bda8872816..4ebcaf6f82 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 |