diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-13 00:39:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-13 00:39:19 +0200 |
| commit | ca19862d3879dfadfd6c1a1a443eac40fc433385 (patch) | |
| tree | dc114d719849d6c3645063e02378dfddecbc991a /libavcodec/msrle.c | |
| parent | 5eeecde859ebfa384fbe3c8a1aa62a6b8f6c58e4 (diff) | |
| parent | 18e8fef7c9292041e3266487d9bc6b59e5eaa798 (diff) | |
| download | ffmpeg-ca19862d3879dfadfd6c1a1a443eac40fc433385.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libxvid: remove disabled code
qdm2: make a table static const
qdm2: simplify bitstream reader setup for some subpacket types
qdm2: use get_bits_left()
build: Consistently handle conditional compilation for all optimization OBJS.
avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics
msrle: convert MS RLE decoding function to bytestream2.
x86inc improvements for 64-bit
Conflicts:
common.mak
libavcodec/avpacket.c
libavcodec/bfi.c
libavcodec/msrledec.c
libavcodec/qdm2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/msrle.c')
| -rw-r--r-- | libavcodec/msrle.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c index e8406029ee..0c54f9af5e 100644 --- a/libavcodec/msrle.c +++ b/libavcodec/msrle.c @@ -40,6 +40,7 @@ typedef struct MsrleContext { AVCodecContext *avctx; AVFrame frame; + GetByteContext gb; const unsigned char *buf; int size; @@ -127,7 +128,8 @@ static int msrle_decode_frame(AVCodecContext *avctx, ptr += s->frame.linesize[0]; } } else { - ff_msrle_decode(avctx, (AVPicture*)&s->frame, avctx->bits_per_coded_sample, buf, buf_size); + bytestream2_init(&s->gb, buf, buf_size); + ff_msrle_decode(avctx, (AVPicture*)&s->frame, avctx->bits_per_coded_sample, &s->gb); } *data_size = sizeof(AVFrame); |