From 992f71e95dcf57c917531f126ba7499ef9ed87d3 Mon Sep 17 00:00:00 2001 From: Ronald Bultje Date: Sat, 31 Mar 2012 17:10:54 +0000 Subject: msrle: convert MS RLE decoding function to bytestream2. Signed-off-by: Justin Ruggles --- libavcodec/bmp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libavcodec/bmp.c') diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c index 5528932878..df947a0745 100644 --- a/libavcodec/bmp.c +++ b/libavcodec/bmp.c @@ -52,6 +52,7 @@ static int bmp_decode_frame(AVCodecContext *avctx, uint8_t *ptr; int dsize; const uint8_t *buf0 = buf; + GetByteContext gb; if(buf_size < 14){ av_log(avctx, AV_LOG_ERROR, "buf size too small (%d)\n", buf_size); @@ -265,7 +266,8 @@ static int bmp_decode_frame(AVCodecContext *avctx, p->data[0] += p->linesize[0] * (avctx->height - 1); p->linesize[0] = -p->linesize[0]; } - ff_msrle_decode(avctx, (AVPicture*)p, depth, buf, dsize); + bytestream2_init(&gb, buf, dsize); + ff_msrle_decode(avctx, (AVPicture*)p, depth, &gb); if(height < 0){ p->data[0] += p->linesize[0] * (avctx->height - 1); p->linesize[0] = -p->linesize[0]; -- cgit v1.2.3