eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-07 22:55:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

ffv1: fix array data types

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 106790a4e9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-10-08 02:11:25 +02:00
parent 8c103410a6
commit 86c8ab1fd8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/ffv1.c
View File

@@ -1242,7 +1242,7 @@ static int encode_slice(AVCodecContext *c, void *arg){
}
if(!fs->ac){
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;
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);
}
@@ -1677,7 +1677,7 @@ static int decode_slice(AVCodecContext *c, void *arg){
if(!fs->ac){
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;
init_get_bits(&fs->gb,
fs->c.bytestream_start + fs->ac_byte_count,
@@ -1706,7 +1706,7 @@ static int decode_slice(AVCodecContext *c, void *arg){
}
if(fs->ac && f->version > 2) {
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;
if(v) {
av_log(f->avctx, AV_LOG_ERROR, "bytestream end mismatching by %d\n", v);