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 05:25:03 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-01-05 05:37:22 +0400
commita57da850c0ae7a9cde8917bb0f30dcee30b43439 (patch)
treee5e218ee82aa9eaef01966b5b708cfada8544f60 /tests/fate
parentfd53f9d985c90be417d2acd5bc7f4300054d9dcd (diff)
parent9d18a7d3ec09d6d933d648570643fde924aa391a (diff)
Merge commit '9d18a7d3ec09d6d933d648570643fde924aa391a'
* commit '9d18a7d3ec09d6d933d648570643fde924aa391a': fate: Update AAC ELD 5.1 ref for recent bugfixes. also reenable fate-aac-er_ad6000np_44_ep0, as this commit updates the pcm reference, so that the test works again Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
-rw-r--r--tests/fate/aac.mak4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak
index 7d9e944e42..7ed5b7b382 100644
--- a/tests/fate/aac.mak
+++ b/tests/fate/aac.mak
@@ -54,9 +54,9 @@ 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
+fate-aac-er_ad6000np_44_ep0: REF = $(SAMPLES)/aac/er_ad6000np_44.s16
FATE_AAC += fate-aac-er_eld1001np_44_ep0
fate-aac-er_eld1001np_44_ep0: CMD = pcm -i $(TARGET_SAMPLES)/aac/er_eld1001np_44_ep0.mp4