-
Michael Niedermayer authored
* qatar/master: 4xm: check bitstream_size boundary before using it Conflicts: libavcodec/4xm.c See: 9c661e95Merged-by: Michael Niedermayer <michaelni@gmx.at>
a9821bda
* qatar/master: 4xm: check bitstream_size boundary before using it Conflicts: libavcodec/4xm.c See: 9c661e95Merged-by: Michael Niedermayer <michaelni@gmx.at>