diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-18 14:27:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-18 14:27:59 +0100 |
| commit | 94ecbe23c52b699a8f2bda1cf71fb4efbf28679a (patch) | |
| tree | 240b05c733a4d256ffbffa74f80fa3dcea49fc81 /tests | |
| parent | 95015634f5017897a61f4883bc217b0f7efbc40c (diff) | |
| parent | c35f0e8495e34c2082dcde805e9323c9f6a4cb0a (diff) | |
| download | ffmpeg-streaming-94ecbe23c52b699a8f2bda1cf71fb4efbf28679a.zip ffmpeg-streaming-94ecbe23c52b699a8f2bda1cf71fb4efbf28679a.tar.gz | |
Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a'
* commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a':
au: Reorder code so that both muxer and demuxer are under #ifdefs
fate: Move RALF test into lossless audio group
cosmetics: Use consistent names for multiple inclusion guards.
Conflicts:
libavformat/au.c
tests/fate/lossless-audio.mak
tests/fate/real.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/lossless-audio.mak | 3 | ||||
| -rw-r--r-- | tests/fate/real.mak | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/fate/lossless-audio.mak b/tests/fate/lossless-audio.mak index 50ebdd9..57aa3aa 100644 --- a/tests/fate/lossless-audio.mak +++ b/tests/fate/lossless-audio.mak @@ -7,6 +7,9 @@ fate-lossless-meridianaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-p FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, APE, APE) += fate-lossless-monkeysaudio fate-lossless-monkeysaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.ape -f s16le +FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, RM, RALF) += fate-ralf +fate-ralf: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.rmvb -vn -f s16le + FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, SHORTEN, SHORTEN) += fate-lossless-shorten fate-lossless-shorten: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.shn -f s16le diff --git a/tests/fate/real.mak b/tests/fate/real.mak index 49b2eb4..0b9f202 100644 --- a/tests/fate/real.mak +++ b/tests/fate/real.mak @@ -12,9 +12,6 @@ fate-ra-cook: CMD = pcm -i $(SAMPLES)/real/ra_cook.rm fate-ra-cook: CMP = oneoff fate-ra-cook: REF = $(SAMPLES)/real/ra_cook.pcm -FATE_REAL-$(call DEMDEC, RM, RALF) += fate-ralf -fate-ralf: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.rmvb -vn -f s16le - FATE_REAL-$(call DEMDEC, RM, RV30) += fate-rv30 fate-rv30: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/real/rv30.rm -an |
