[FFmpeg-cvslog] avcodec/iff: fix artifacts with uncompressed ham ANIMs

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Tue May 17 11:01:02 2016 +0200| [95b20ad7b20c70c009022d729e24c130af975ed8] | committer: Paul B Mahol

avcodec/iff: fix artifacts with uncompressed ham ANIMs

Signed-off-by: Paul B Mahol <onemda at gmail.com>

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

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

diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index 9d7dce5..fbb0dae 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -1366,9 +1366,9 @@ static int decode_frame(AVCodecContext *avctx,
             }
         } else if (avctx->codec_tag == MKTAG('I', 'L', 'B', 'M') || // interleaved
                    avctx->codec_tag == MKTAG('A', 'N', 'I', 'M')) {
+            if (avctx->codec_tag == MKTAG('A', 'N', 'I', 'M'))
+                memcpy(s->video[0], buf, FFMIN(buf_end - buf, s->video_size));
             if (avctx->pix_fmt == AV_PIX_FMT_PAL8 || avctx->pix_fmt == AV_PIX_FMT_GRAY8) {
-                if (avctx->codec_tag == MKTAG('A', 'N', 'I', 'M'))
-                    memcpy(s->video[0], buf, FFMIN(buf_end - buf, s->video_size));
                 for (y = 0; y < avctx->height; y++) {
                     uint8_t *row = &frame->data[0][y * frame->linesize[0]];
                     memset(row, 0, avctx->width);