Changeset 573a8ce8 in ffmpeg

Timestamp:

Feb 16, 2014, 7:39:14 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a392bf65

Parents:

05e9e334 (diff), 77fbc032 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (02/16/14 19:37:18)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/16/14 19:39:14)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: g2meet: validate bpp and bitmasks in the display info

Conflicts:

libavcodec/g2meet.c

See: ae95b2f8103cf0136889884fdf1c4e5136634991
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)