Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / anm.c

diff --git a/libavcodec/anm.c b/libavcodec/anm.c
index b84aef1c1b9fa7085eae6e79bc2f0e0320fea860..5493be6842ba80214fa028703094302ab5841cf5 100644 (file)
--- a/libavcodec/anm.c
+++ b/libavcodec/anm.c
@@ -45,7 +45,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
         return -1;
 
     avcodec_get_frame_defaults(&s->frame);
-    s->frame.reference = 1;
+    s->frame.reference = 3;
 
     buf = avctx->extradata + 16*8;
     for (i = 0; i < 256; i++)
@@ -79,6 +79,8 @@ static inline int op(uint8_t **dst, const uint8_t *dst_end,
         int striplen = FFMIN(count, remaining);
         if (buf) {
             striplen = FFMIN(striplen, buf_end - *buf);
+            if (*buf >= buf_end)
+                goto exhausted;
             memcpy(*dst, *buf, striplen);
             *buf += striplen;
         } else if (pixel >= 0)