[FFmpeg-cvslog] anm decoder: move buffer allocation from decode_init() to decode_frame()

[Peter Ross]

ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Sat Apr 16 00:59:19 2011 +1000| [62931e11d6b74386eeb377d1f677f55aca13ab3e] | committer: Michael Niedermayer

anm decoder: move buffer allocation from decode_init() to decode_frame()

This permits playback in ffplay when libavfilter is enabled.

Resolves ticket #60

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

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

 libavcodec/anm.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/libavcodec/anm.c b/libavcodec/anm.c
index 5b2b9df..e216c08 100644
--- a/libavcodec/anm.c
+++ b/libavcodec/anm.c
@@ -29,6 +29,7 @@
 
 typedef struct AnmContext {
     AVFrame frame;
+    int palette[AVPALETTE_COUNT];
     int x;  ///< x coordinate position
 } AnmContext;
 
@@ -44,14 +45,10 @@ static av_cold int decode_init(AVCodecContext *avctx)
         return -1;
 
     s->frame.reference = 1;
-    if (avctx->get_buffer(avctx, &s->frame) < 0) {
-        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
-        return -1;
-    }
 
     buf = avctx->extradata + 16*8;
     for (i = 0; i < 256; i++)
-        ((uint32_t*)s->frame.data[1])[i] = bytestream_get_le32(&buf);
+        s->palette[i] = bytestream_get_le32(&buf);
 
     return 0;
 }
@@ -170,6 +167,8 @@ static int decode_frame(AVCodecContext *avctx,
         }
     } while (buf + 1 < buf_end);
 
+    memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE);
+
     *data_size = sizeof(AVFrame);
     *(AVFrame*)data = s->frame;
     return buf_size;