diff options
author | Michael Niedermayer | 2015-06-21 19:41:40 +0200 |
---|---|---|
committer | Michael Niedermayer | 2015-06-21 20:32:06 +0200 |
commit | ae215e2b42dd172f6bfd9f2dad44c9d5c11884bf (patch) | |
tree | 14ac07afbbba24d9d557d0e3893bdf3699c31619 /tests | |
parent | 3bcf61f495dcadbc9679a00e6b1023531288498d (diff) | |
parent | 6ec688e1bc76dd93151cbca1c340162ae4b10d77 (diff) |
Merge commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77'
* commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77':
mp3: enable packed main_data decoding in MP4
Conflicts:
libavcodec/mpegaudiodec_template.c
Only the parts needed to support the available sample are merged
the remaining error checks are left in place
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/fate/mp3.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/mp3.mak b/tests/fate/mp3.mak index 57ee08414b..a7b46c0969 100644 --- a/tests/fate/mp3.mak +++ b/tests/fate/mp3.mak @@ -1,6 +1,6 @@ FATE_MP3 += fate-mp3-float-conf-compl fate-mp3-float-conf-compl: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/compl.bit -fate-mp3-float-conf-compl: REF = $(SAMPLES)/mp3-conformance/compl.pcm +fate-mp3-float-conf-compl: REF = $(SAMPLES)/mp3-conformance/compl_2.pcm FATE_MP3 += fate-mp3-float-conf-he_32khz fate-mp3-float-conf-he_32khz: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/he_32khz.bit -fs 343296 |