Commit c387c45e authored by Michael Niedermayer's avatar Michael Niedermayer

ffv1: fix plane_count at version 1.4

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 8ec61882
......@@ -499,7 +499,7 @@ static int read_extra_header(FFV1Context *f)
f->chroma_h_shift = get_symbol(c, state, 0);
f->chroma_v_shift = get_symbol(c, state, 0);
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_v_slices = 1 + get_symbol(c, state, 0);
......
......@@ -797,6 +797,9 @@ static av_cold int encode_init(AVCodecContext *avctx)
if (!s->transparency)
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);
s->picture_number = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment