diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 21:59:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 21:59:34 +0100 |
| commit | 8f140a8ec3b8be57892be7103998da3321e4aeb8 (patch) | |
| tree | 4865bb7315d6fff6dd9bf8687ad67d62fa43ba1e /tests | |
| parent | 9ad8f55edaf20a73ebf42ad9f0398e96a1726690 (diff) | |
| parent | ce52869c22738ad584995d48103ce3aa2301736b (diff) | |
| download | ffmpeg-8f140a8ec3b8be57892be7103998da3321e4aeb8.tar.gz | |
Merge commit 'ce52869c22738ad584995d48103ce3aa2301736b'
* commit 'ce52869c22738ad584995d48103ce3aa2301736b':
fate: Rename fate-dts test to fate-dca-core
Conflicts:
tests/fate/audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/audio.mak | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak index da6f0bb55f..4a2d4101f0 100644 --- a/tests/fate/audio.mak +++ b/tests/fate/audio.mak @@ -16,6 +16,11 @@ fate-binkaudio: $(FATE_BINKAUDIO-yes) FATE_SAMPLES_AUDIO-$(call DEMDEC, BMV, BMV_AUDIO) += fate-bmv-audio fate-bmv-audio: CMD = framecrc -i $(TARGET_SAMPLES)/bmv/SURFING-partial.BMV -vn +FATE_SAMPLES_AUDIO-$(call DEMDEC, MPEGTS, DCA) += fate-dca-core +fate-dca-core: CMD = pcm -i $(TARGET_SAMPLES)/dts/dts.ts +fate-dca-core: CMP = oneoff +fate-dca-core: REF = $(SAMPLES)/dts/dts.pcm + FATE_SAMPLES_AUDIO-$(call DEMDEC, DSICIN, DSICINAUDIO) += fate-delphine-cin-audio fate-delphine-cin-audio: CMD = framecrc -i $(TARGET_SAMPLES)/delphine-cin/LOGO-partial.CIN -vn @@ -23,11 +28,6 @@ FATE_SAMPLES_AUDIO-$(call DEMDEC, DSS, DSS_SP) += fate-dss-lp fate-dss-sp fate-dss-lp: CMD = framecrc -i $(TARGET_SAMPLES)/dss/lp.dss -frames 30 fate-dss-sp: CMD = framecrc -i $(TARGET_SAMPLES)/dss/sp.dss -frames 30 -FATE_SAMPLES_AUDIO-$(call DEMDEC, MPEGTS, DCA) += fate-dts -fate-dts: CMD = pcm -i $(TARGET_SAMPLES)/dts/dts.ts -fate-dts: CMP = oneoff -fate-dts: REF = $(SAMPLES)/dts/dts.pcm - FATE_SAMPLES_AUDIO-$(call DEMDEC, DTS, DCA) += fate-dts_es fate-dts_es: CMD = pcm -i $(TARGET_SAMPLES)/dts/dts_es.dts fate-dts_es: CMP = oneoff |