-
Michael Niedermayer authored
* qatar/master: g2meet: validate bpp and bitmasks in the display info Conflicts: libavcodec/g2meet.c See: ae95b2f8Merged-by: Michael Niedermayer <michaelni@gmx.at>
573a8ce8
* qatar/master: g2meet: validate bpp and bitmasks in the display info Conflicts: libavcodec/g2meet.c See: ae95b2f8Merged-by: Michael Niedermayer <michaelni@gmx.at>