-
Michael Niedermayer authored
* commit 'a10c4ce2 ': aac: Forward errors properly in aac_decode_frame_int Conflicts: libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
d6c36fba
* commit 'a10c4ce2 ': aac: Forward errors properly in aac_decode_frame_int Conflicts: libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>