summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Aimar <[email protected]>2011-09-09 22:04:09 +0200
committerMichael Niedermayer <[email protected]>2011-09-21 17:59:43 +0200
commitbac822025e6d73d0932ac1a18e80658be186ccf9 (patch)
tree31faee3bb6f4982be5e6446f3092f7842010a5ea
parent8a8aafd2b901f78a3ce02fad717482ae58ab72b7 (diff)
Fixed size given to init_get_bits() in ffv1 decoder.
init_get_bits() takes a number of bits and not a number of bytes as its size argument. Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 8362a0ffed0b15a9977fcde947bcb49dfc06638b)
-rw-r--r--libavcodec/ffv1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index a0a4a1d009..8fe725f78a 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -1805,7 +1805,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 */
}
@@ -1822,7 +1822,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);
}
}