virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

ffv1: fix array data types

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-08 02:11:25 +02:00
parent fc6860a3eb
commit 106790a4e9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/ffv1.c
View File

@ -1245,7 +1245,7 @@ static int encode_slice(AVCodecContext *c, void *arg){
} }
if(!fs->ac){ if(!fs->ac){
if(f->version > 2) if(f->version > 2)
put_rac(&fs->c, (int[]){129}, 0); put_rac(&fs->c, (uint8_t[]){129}, 0);
fs->ac_byte_count = f->version > 2 || (!x&&!y) ? ff_rac_terminate(&fs->c) : 0; fs->ac_byte_count = f->version > 2 || (!x&&!y) ? ff_rac_terminate(&fs->c) : 0;
init_put_bits(&fs->pb, fs->c.bytestream_start + fs->ac_byte_count, fs->c.bytestream_end - fs->c.bytestream_start - fs->ac_byte_count); init_put_bits(&fs->pb, fs->c.bytestream_start + fs->ac_byte_count, fs->c.bytestream_end - fs->c.bytestream_start - fs->ac_byte_count);
} }
@ -1678,7 +1678,7 @@ static int decode_slice(AVCodecContext *c, void *arg){
if(!fs->ac){ if(!fs->ac){
if (f->version == 3 && f->minor_version > 1 || f->version > 3) if (f->version == 3 && f->minor_version > 1 || f->version > 3)
get_rac(&fs->c, (int[]){129}); get_rac(&fs->c, (uint8_t[]){129});
fs->ac_byte_count = f->version > 2 || (!x&&!y) ? fs->c.bytestream - fs->c.bytestream_start - 1 : 0; fs->ac_byte_count = f->version > 2 || (!x&&!y) ? fs->c.bytestream - fs->c.bytestream_start - 1 : 0;
init_get_bits(&fs->gb, init_get_bits(&fs->gb,
fs->c.bytestream_start + fs->ac_byte_count, fs->c.bytestream_start + fs->ac_byte_count,
@ -1707,7 +1707,7 @@ static int decode_slice(AVCodecContext *c, void *arg){
} }
if(fs->ac && f->version > 2) { if(fs->ac && f->version > 2) {
int v; int v;
get_rac(&fs->c, (int[]){129}); get_rac(&fs->c, (uint8_t[]){129});
v = fs->c.bytestream_end - fs->c.bytestream - 2 - 5*f->ec; v = fs->c.bytestream_end - fs->c.bytestream - 2 - 5*f->ec;
if(v) { if(v) {
av_log(f->avctx, AV_LOG_ERROR, "bytestream end mismatching by %d\n", v); av_log(f->avctx, AV_LOG_ERROR, "bytestream end mismatching by %d\n", v);