diff options
author | Laurent Aimar <fenrir@videolan.org> | 2011-09-09 22:04:09 +0200 |
---|---|---|
committer | Alex Converse <alex.converse@gmail.com> | 2011-09-09 15:00:28 -0700 |
commit | 46b004959bb7870a361a57272cd5fa7eea34250b (patch) | |
tree | a41d6ff0b84a5807e96b0203f540d83e1057e46e /libavcodec | |
parent | dba2b63a98bdcac7bda1a8a2c48950518c075e17 (diff) | |
download | ffmpeg-streaming-46b004959bb7870a361a57272cd5fa7eea34250b.zip ffmpeg-streaming-46b004959bb7870a361a57272cd5fa7eea34250b.tar.gz |
ffv1: Fixed size given to init_get_bits() in decoder.
init_get_bits() takes a number of bits and not a number of bytes as
its size argument.
Signed-off-by: Alex Converse <alex.converse@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/ffv1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 15d9553..8a6f33f 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -1693,7 +1693,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac bytes_read = c->bytestream - c->bytestream_start - 1; if(bytes_read ==0) av_log(avctx, AV_LOG_ERROR, "error at end of AC stream\n"); //FIXME //printf("pos=%d\n", bytes_read); - init_get_bits(&f->slice_context[0]->gb, buf + bytes_read, buf_size - bytes_read); + init_get_bits(&f->slice_context[0]->gb, buf + bytes_read, (buf_size - bytes_read) * 8); } else { bytes_read = 0; /* avoid warning */ } @@ -1710,7 +1710,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac if(fs->ac){ ff_init_range_decoder(&fs->c, buf_p, v); }else{ - init_get_bits(&fs->gb, buf_p, v); + init_get_bits(&fs->gb, buf_p, v * 8); } } |