diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 12:07:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 12:09:38 +0200 |
| commit | 6561aae8a955b9237034a004fc92d7fbb3541491 (patch) | |
| tree | 74d25600e38874365ee9909a5c20d6ad0b57f3bf /libavcodec/xl.c | |
| parent | 39a69d9dfbc7d527018546d7a1a1be99d82dceeb (diff) | |
| parent | 3ca1dd2502a860989ee5289316af6b9816cee78f (diff) | |
| download | ffmpeg-6561aae8a955b9237034a004fc92d7fbb3541491.tar.gz | |
Merge commit '3ca1dd2502a860989ee5289316af6b9816cee78f'
* commit '3ca1dd2502a860989ee5289316af6b9816cee78f':
xl: Make sure the width is valid
Conflicts:
libavcodec/xl.c
See: 94b42da6963a88c9518039e0b8ca42b6aab8bfb3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xl.c')
| -rw-r--r-- | libavcodec/xl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/xl.c b/libavcodec/xl.c index f0e83fcf29..ff62a0f62b 100644 --- a/libavcodec/xl.c +++ b/libavcodec/xl.c @@ -49,11 +49,10 @@ static int decode_frame(AVCodecContext *avctx, uint32_t val; int y0, y1, y2, y3 = 0, c0 = 0, c1 = 0; - if (avctx->width & 3) { + if (avctx->width % 4) { av_log(avctx, AV_LOG_ERROR, "width is not a multiple of 4\n"); return AVERROR_INVALIDDATA; } - if (buf_size < avctx->width * avctx->height) { av_log(avctx, AV_LOG_ERROR, "Packet is too small\n"); return AVERROR_INVALIDDATA; |