Commit b05cd1ea authored by Michael Niedermayer's avatar Michael Niedermayer

ffv1dec: Check bits_per_raw_sample and colorspace for equality in ver 0/1 headers

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 05507348
...@@ -580,7 +580,7 @@ static int read_header(FFV1Context *f) ...@@ -580,7 +580,7 @@ static int read_header(FFV1Context *f)
memset(state, 128, sizeof(state)); memset(state, 128, sizeof(state));
if (f->version < 2) { if (f->version < 2) {
int chroma_planes, chroma_h_shift, chroma_v_shift, transparency; int chroma_planes, chroma_h_shift, chroma_v_shift, transparency, colorspace, bits_per_raw_sample;
unsigned v= get_symbol(c, state, 0); unsigned v= get_symbol(c, state, 0);
if (v >= 2) { if (v >= 2) {
av_log(f->avctx, AV_LOG_ERROR, "invalid version %d in ver01 header\n", v); av_log(f->avctx, AV_LOG_ERROR, "invalid version %d in ver01 header\n", v);
...@@ -593,18 +593,17 @@ static int read_header(FFV1Context *f) ...@@ -593,18 +593,17 @@ static int read_header(FFV1Context *f)
f->state_transition[i] = get_symbol(c, state, 1) + c->one_state[i]; f->state_transition[i] = get_symbol(c, state, 1) + c->one_state[i];
} }
f->colorspace = get_symbol(c, state, 0); //YUV cs type colorspace = get_symbol(c, state, 0); //YUV cs type
bits_per_raw_sample = f->version > 0 ? get_symbol(c, state, 0) : f->avctx->bits_per_raw_sample;
if (f->version > 0)
f->avctx->bits_per_raw_sample = get_symbol(c, state, 0);
chroma_planes = get_rac(c, state); chroma_planes = get_rac(c, state);
chroma_h_shift = get_symbol(c, state, 0); chroma_h_shift = get_symbol(c, state, 0);
chroma_v_shift = get_symbol(c, state, 0); chroma_v_shift = get_symbol(c, state, 0);
transparency = get_rac(c, state); transparency = get_rac(c, state);
if (f->plane_count) { if (f->plane_count) {
if ( chroma_planes != f->chroma_planes if ( colorspace != f->colorspace
|| bits_per_raw_sample != f->avctx->bits_per_raw_sample
|| chroma_planes != f->chroma_planes
|| chroma_h_shift!= f->chroma_h_shift || chroma_h_shift!= f->chroma_h_shift
|| chroma_v_shift!= f->chroma_v_shift || chroma_v_shift!= f->chroma_v_shift
|| transparency != f->transparency) { || transparency != f->transparency) {
...@@ -613,6 +612,8 @@ static int read_header(FFV1Context *f) ...@@ -613,6 +612,8 @@ static int read_header(FFV1Context *f)
} }
} }
f->colorspace = colorspace;
f->avctx->bits_per_raw_sample = bits_per_raw_sample;
f->chroma_planes = chroma_planes; f->chroma_planes = chroma_planes;
f->chroma_h_shift = chroma_h_shift; f->chroma_h_shift = chroma_h_shift;
f->chroma_v_shift = chroma_v_shift; f->chroma_v_shift = chroma_v_shift;
......
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