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 | |
| 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>
| -rw-r--r-- | libavcodec/g2meet.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index cf3562edd1..beeb392aae 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -733,8 +733,10 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data, c->tiles_y = (c->height + c->tile_height - 1) / c->tile_height; c->bpp = bytestream2_get_byte(&bc); if (c->bpp == 32) { - if (bytestream2_get_bytes_left(&bc) < 16 || (chunk_size - 21) < 16 ) { - av_log(avctx, AV_LOG_ERROR, "Display info: missing bitmasks!\n"); + if (bytestream2_get_bytes_left(&bc) < 16 || + (chunk_size - 21) < 16 ) { + av_log(avctx, AV_LOG_ERROR, + "Display info: missing bitmasks!\n"); return AVERROR_INVALIDDATA; } r_mask = bytestream2_get_be32(&bc); @@ -747,8 +749,7 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_PATCHWELCOME; } } else { - av_log(avctx, AV_LOG_ERROR, - "Unsupported bpp=%d in the display info!\n", c->bpp); + avpriv_request_sample(avctx, "bpp=%d", c->bpp); return AVERROR_PATCHWELCOME; } if (g2m_init_buffers(c)) { |