aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/cljr.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-09-10 20:52:48 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-10 20:52:48 +0200
commit7db7eb08e051d0d95215f645e0cfa9a5879cded0 (patch)
tree62fb724f4bc8fd03e521ef797d42e61708310f14 /libavcodec/cljr.c
parent60599c68b04ec9d8b09750dd3f45f6ce92e61d35 (diff)
parent8bfea4ab4e2cb32bc7bf6f697ee30a238c65d296 (diff)
downloadffmpeg-7db7eb08e051d0d95215f645e0cfa9a5879cded0.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks. avconv: move audio_channels to the options context. avconv: move *_disable to options context. avconv: remove -[vas]lang options. avconv: move codec tags to options context. cljr: init_get_bits size in bits instead of bytes indeo2: fail if input buffer too small indeo2: init_get_bits size in bits instead of bytes ffv1: Fixed size given to init_get_bits() in decoder. Conflicts: avconv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cljr.c')
-rw-r--r--libavcodec/cljr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c
index 2e7fd51f1f..8af149fa58 100644
--- a/libavcodec/cljr.c
+++ b/libavcodec/cljr.c
@@ -67,7 +67,7 @@ static int decode_frame(AVCodecContext *avctx,
p->pict_type= AV_PICTURE_TYPE_I;
p->key_frame= 1;
- init_get_bits(&a->gb, buf, buf_size);
+ init_get_bits(&a->gb, buf, buf_size * 8);
for(y=0; y<avctx->height; y++){
uint8_t *luma= &a->picture.data[0][ y*a->picture.linesize[0] ];