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