virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Code Issues Releases Activity

ffv1: fix plane_count at version 1.4

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-15 13:03:32 +02:00
parent 8ec6188263
commit c387c45e83
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/ffv1dec.c
View File

@ -499,7 +499,7 @@ static int read_extra_header(FFV1Context *f)
f->chroma_h_shift = get_symbol(c, state, 0); f->chroma_h_shift = get_symbol(c, state, 0);
f->chroma_v_shift = get_symbol(c, state, 0); f->chroma_v_shift = get_symbol(c, state, 0);
f->transparency = get_rac(c, state); f->transparency = get_rac(c, state);
f->plane_count = 2 + f->transparency; f->plane_count = 1 + (f->chroma_planes || f->version<4) + f->transparency;
f->num_h_slices = 1 + get_symbol(c, state, 0); f->num_h_slices = 1 + get_symbol(c, state, 0);
f->num_v_slices = 1 + get_symbol(c, state, 0); f->num_v_slices = 1 + get_symbol(c, state, 0);

3
libavcodec/ffv1enc.c
View File

@ -797,6 +797,9 @@ static av_cold int encode_init(AVCodecContext *avctx)
if (!s->transparency) if (!s->transparency)
s->plane_count = 2; s->plane_count = 2;
if (!s->chroma_planes && s->version > 3)
s->plane_count--;
avcodec_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_h_shift, &s->chroma_v_shift); avcodec_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_h_shift, &s->chroma_v_shift);
s->picture_number = 0; s->picture_number = 0;