diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-05-28 17:58:46 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-28 19:26:15 +0400 |
| commit | c4e3dd06e8fa12582ec459181fcbd047687f2861 (patch) | |
| tree | 405c48fdea7079df25c1d5524cca317086354c1c /libavcodec | |
| parent | 88a145738bc3cced72e65faf2a5433bc4eb5fd43 (diff) | |
Test extradata size before reading from extradata when decoding avui.
(cherry picked from commit 83de4f5fc92b1424c7d77f3411572a9a00eff672)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avuidec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/avuidec.c b/libavcodec/avuidec.c index a1beb37e80..32fd819ea7 100644 --- a/libavcodec/avuidec.c +++ b/libavcodec/avuidec.c @@ -48,8 +48,8 @@ static int avui_decode_frame(AVCodecContext *avctx, void *data, if (pic->data[0]) avctx->release_buffer(avctx, pic); - if (!memcmp(&avctx->extradata[4], "APRGAPRG0001", 12) && - avctx->extradata_size >= 24) + if (avctx->extradata_size >= 24 && + !memcmp(&avctx->extradata[4], "APRGAPRG0001", 12)) interlaced = avctx->extradata[19] != 1; if (avctx->height == 486) { skip = 10; |