RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-04 22:30:25 +00:00
Code Issues Projects Releases Wiki Activity

ffv1: inject sentinels for RC->VLC transitions begining with 1.3

Browse Source 
This breaks bitstream compatibility of 1.3 VLC streams
This fixes very rare errors in the RC stream at the transition point
to VLC.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-09-24 04:54:26 +02:00
parent ad9371ef24
commit d8676140de
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/ffv1.c
View File

@ -817,7 +817,7 @@ static int write_extra_header(FFV1Context *f){
put_symbol(c, state, f->version, 0);
if(f->version > 2) {
if(f->version == 3)
f->minor_version = 1;
f->minor_version = 2;
put_symbol(c, state, f->minor_version, 0);
}
put_symbol(c, state, f->ac, 0);
@ -1241,6 +1241,8 @@ static int encode_slice(AVCodecContext *c, void *arg){
encode_slice_header(f, fs);
}
if(!fs->ac){
if(f->version > 2)
put_rac(&fs->c, (int[]){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);
}
@ -1675,6 +1677,8 @@ static int decode_slice(AVCodecContext *c, void *arg){
y= fs->slice_y;
if(!fs->ac){
if (f->version > 2)
get_rac(&fs->c, (int[]){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,