mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-28 20:53:54 +02:00
Merge commit 'f5c43884190be094749acfba104e3eab98d8ff1e'
* commit 'f5c43884190be094749acfba104e3eab98d8ff1e': FATE: drop the audio stream from the dxtory test Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
commit
cd52ec2337
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user