1. ffmpeg
  2. Commit cd52ec2337ae0d78c53ed32602a100a67b829fe4
Browse code

Merge commit 'f5c43884190be094749acfba104e3eab98d8ff1e'

* commit 'f5c43884190be094749acfba104e3eab98d8ff1e':
FATE: drop the audio stream from the dxtory test

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Hendrik Leppkes authored on 2016/06/26 22:41:49
Showing 2 changed files
tests/fate/screen.mak
History View file @ cd52ec2
... ... 
@@ -3,7 +3,7 @@ FATE_SCREEN-$(call DEMDEC, AVI, CSCD) += fate-cscd
3 3 
 fate-cscd: CMD = framecrc -i $(TARGET_SAMPLES)/CSCD/sample_video.avi -an -pix_fmt rgb24
4 4
5 5 
 FATE_SCREEN-$(call DEMDEC, AVI, DXTORY) += fate-dxtory
6 
-fate-dxtory: CMD = framecrc -i $(TARGET_SAMPLES)/dxtory/dxtory_mic.avi
6 
+fate-dxtory: CMD = framecrc -i $(TARGET_SAMPLES)/dxtory/dxtory_mic.avi -an
7 7
8 8 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, FIC) += fate-fic-avi
9 9 
 fate-fic-avi: CMD = framecrc -i $(TARGET_SAMPLES)/fic/fic-partial-2MB.avi -an
tests/ref/fate/dxtory
History View file @ cd52ec2
... ... 
@@ -3,9 +3,4 @@
3 3 
 #codec_id 0: rawvideo
4 4 
 #dimensions 0: 1280x720
5 5 
 #sar 0: 0/1
6 
-#tb 1: 1/48000
7 
-#media_type 1: audio
8 
-#codec_id 1: pcm_s16le
9 
-#sample_rate 1: 48000
10 
-#channel_layout 1: 3
11 6 
 0,          0,          0,        1,  1382400, 0x44373645