[FFmpeg-cvslog] avcodec/mss1: use init_get_bits8()

Paul B Mahol git at videolan.org
Tue Nov 5 14:21:05 CET 2013


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Tue Nov  5 12:50:43 2013 +0000| [b79f543c58691d21e9b5ec45be55d38b5e2e0c8d] | committer: Paul B Mahol

avcodec/mss1: use init_get_bits8()

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

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

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

diff --git a/libavcodec/mss1.c b/libavcodec/mss1.c
index 46ea2b5..3e24d79 100644
--- a/libavcodec/mss1.c
+++ b/libavcodec/mss1.c
@@ -139,8 +139,6 @@ static int decode_pal(MSS12Context *ctx, ArithCoder *acoder)
 static int mss1_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
                              AVPacket *avpkt)
 {
-    const uint8_t *buf = avpkt->data;
-    int buf_size = avpkt->size;
     MSS1Context *ctx = avctx->priv_data;
     MSS12Context *c = &ctx->ctx;
     GetBitContext gb;
@@ -148,7 +146,9 @@ static int mss1_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
     int pal_changed = 0;
     int ret;
 
-    init_get_bits(&gb, buf, buf_size * 8);
+    if ((ret = init_get_bits8(&gb, avpkt->data, avpkt->size)) < 0)
+        return ret;
+
     arith_init(&acoder, &gb);
 
     if ((ret = ff_reget_buffer(avctx, &ctx->pic)) < 0)
@@ -182,7 +182,7 @@ static int mss1_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
     *got_frame      = 1;
 
     /* always report that the buffer was completely consumed */
-    return buf_size;
+    return avpkt->size;
 }
 
 static av_cold int mss1_decode_init(AVCodecContext *avctx)



More information about the ffmpeg-cvslog mailing list