diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 02:25:03 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 02:37:22 +0100 |
commit | a57da850c0ae7a9cde8917bb0f30dcee30b43439 (patch) | |
tree | e5e218ee82aa9eaef01966b5b708cfada8544f60 /libavformat/matroskaenc.c | |
parent | fd53f9d985c90be417d2acd5bc7f4300054d9dcd (diff) | |
parent | 9d18a7d3ec09d6d933d648570643fde924aa391a (diff) | |
download | ffmpeg-a57da850c0ae7a9cde8917bb0f30dcee30b43439.tar.gz |
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 'libavformat/matroskaenc.c')
0 files changed, 0 insertions, 0 deletions