diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-16 20:37:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-16 20:39:14 +0100 |
| commit | 573a8ce8f94f1b614bde6bbdf34f7ef88dabc076 (patch) | |
| tree | 065e629c673d27ea89182772a3f0519465a262ac /libavcodec/dxtory.c | |
| parent | 05e9e3342fe10483458b456e9111537f07c1ce22 (diff) | |
| parent | 77fbc032655534ab82627c982192323f2e0d5f18 (diff) | |
| download | ffmpeg-573a8ce8f94f1b614bde6bbdf34f7ef88dabc076.tar.gz | |
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>
Diffstat (limited to 'libavcodec/dxtory.c')
0 files changed, 0 insertions, 0 deletions