aboutsummaryrefslogtreecommitdiffstats
path: root/tests/fate/pcm.mak
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-31 01:16:45 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-31 01:16:45 +0100
commit1a6a088f7c7b164042ad16d43d05543ce1bacfa4 (patch)
treead29c28f8c42f776f85a65cef87ed625c1a302e2 /tests/fate/pcm.mak
parente146ad95d79b1a6e6b9e566366b832825c79679f (diff)
parent9afc025bff4e3a517105a69ec5009ac66b38f483 (diff)
downloadffmpeg-1a6a088f7c7b164042ad16d43d05543ce1bacfa4.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: fate: whitespace cosmetics fate: split off video codec FATE tests into their own file fate: split off audio codec FATE tests into their own file fate: split off Electronic Arts codec FATE tests into their own file fate: split off QuickTime codec FATE tests into their own file fate: split off voice codec FATE tests into their own file fate: split off demuxer FATE tests into their own file cosmetics: Drop unnecessary parentheses around return values. fate: drop pointless _audio and _video suffixes from xan tests qt-faststart: K&R reformatting; fix comment typos FATE: Add test for H.264 MP4->annex.B bitstream filter. Conflicts: ffplay.c tests/fate.mak tests/fate/h264.mak tests/fate/image.mak tests/fate/lossless-audio.mak tests/fate/lossless-video.mak tests/fate/qtrle.mak tests/fate/real.mak tests/fate/screen.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/pcm.mak')
-rw-r--r--tests/fate/pcm.mak4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/fate/pcm.mak b/tests/fate/pcm.mak
index f8ee34aeca..2c4b8e417c 100644
--- a/tests/fate/pcm.mak
+++ b/tests/fate/pcm.mak
@@ -1,8 +1,8 @@
FATE_TESTS += fate-duck-dk3
-fate-duck-dk3: CMD = md5 -i $(SAMPLES)/duck/sop-audio-only.avi -f s16le
+fate-duck-dk3: CMD = md5 -i $(SAMPLES)/duck/sop-audio-only.avi -f s16le
FATE_TESTS += fate-duck-dk4
-fate-duck-dk4: CMD = md5 -i $(SAMPLES)/duck/salsa-audio-only.avi -f s16le
+fate-duck-dk4: CMD = md5 -i $(SAMPLES)/duck/salsa-audio-only.avi -f s16le
FATE_TESTS += fate-ea-mad-pcm-planar
fate-ea-mad-pcm-planar: CMD = framecrc -i $(SAMPLES)/ea-mad/xeasport.mad