[FFmpeg-cvslog] Test extradata size before reading from extradata when decoding avui.

[Carl Eugen Hoyos]

ffmpeg | branch: release/0.11 | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon May 28 15:58:46 2012 +0200| [c4e3dd06e8fa12582ec459181fcbd047687f2861] | committer: Michael Niedermayer

Test extradata size before reading from extradata when decoding avui.
(cherry picked from commit 83de4f5fc92b1424c7d77f3411572a9a00eff672)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c4e3dd06e8fa12582ec459181fcbd047687f2861
---

 libavcodec/avuidec.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/avuidec.c b/libavcodec/avuidec.c
index a1beb37..32fd819 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;