-
Michael Niedermayer authored
* commit '7e4e010b': mpeg4audio: check the init_get_bits() return value Conflicts: libavcodec/mpeg4audio.c See: deefdf97Merged-by: Michael Niedermayer <michaelni@gmx.at>
1cf0f279
* commit '7e4e010b': mpeg4audio: check the init_get_bits() return value Conflicts: libavcodec/mpeg4audio.c See: deefdf97Merged-by: Michael Niedermayer <michaelni@gmx.at>