Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-05 04:48:29 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-01-05 05:02:02 +0400
commit4195ae0fd81534b4e68b9b3533f9da9b0a19a5fe (patch)
tree8cc4f58c4ec84c156232ba68e7c92e3be4f14be2 /tests/fate
parentc69906151b50e7e5ebc8e0ef5906accfe7465f4f (diff)
parentb2212dec0f011893ec68eecaa990170fa24050d7 (diff)
Merge commit 'b2212dec0f011893ec68eecaa990170fa24050d7'
* commit 'b2212dec0f011893ec68eecaa990170fa24050d7': aac: Fix TNS decoding for the 512 sample window family. also temporarily disable fate-aac-er_ad6000np_44_ep0 as this commit causes a mismatch with the reference pcm file The test will be reenabled after all fixes and with a new pcm reference Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
-rw-r--r--tests/fate/aac.mak2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak
index ad87bb775a..6e80fd4512 100644
--- a/tests/fate/aac.mak
+++ b/tests/fate/aac.mak
@@ -54,7 +54,7 @@ FATE_AAC += fate-aac-ap05_48
fate-aac-ap05_48: CMD = pcm -i $(TARGET_SAMPLES)/aac/ap05_48.mp4
fate-aac-ap05_48: REF = $(SAMPLES)/aac/ap05_48.s16
-FATE_AAC += fate-aac-er_ad6000np_44_ep0
+#FATE_AAC += fate-aac-er_ad6000np_44_ep0
fate-aac-er_ad6000np_44_ep0: CMD = pcm -i $(TARGET_SAMPLES)/aac/er_ad6000np_44_ep0.mp4
fate-aac-er_ad6000np_44_ep0: REF = $(SAMPLES)/aac/er_ad6000np_44_ep0.s16