-
Michael Niedermayer authored
* commit '71953ebc': aac: Check init_get_bits return value Conflicts: libavcodec/aacdec.c See: 73abc3a6Merged-by: Michael Niedermayer <michaelni@gmx.at>
48af8781
* commit '71953ebc': aac: Check init_get_bits return value Conflicts: libavcodec/aacdec.c See: 73abc3a6Merged-by: Michael Niedermayer <michaelni@gmx.at>