From cf52e6d012d035b82080e6cc045378f900627870 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 28 May 2015 01:01:16 +0200 Subject: avcodec/ffv1dec: Fix skip_alpha Fixes Ticket4322 Signed-off-by: Michael Niedermayer --- libavcodec/ffv1dec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavcodec/ffv1dec.c') diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index d3927a25b7..cc7c605c6b 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -645,6 +645,8 @@ static int read_header(FFV1Context *f) chroma_h_shift = get_symbol(c, state, 0); chroma_v_shift = get_symbol(c, state, 0); transparency = get_rac(c, state); + if (colorspace == 0 && f->avctx->skip_alpha) + transparency = 0; if (f->plane_count) { if (colorspace != f->colorspace || @@ -675,7 +677,6 @@ static int read_header(FFV1Context *f) } if (f->colorspace == 0) { - if (f->avctx->skip_alpha) f->transparency = 0; if (!f->transparency && !f->chroma_planes) { if (f->avctx->bits_per_raw_sample <= 8) f->avctx->pix_fmt = AV_PIX_FMT_GRAY8; -- cgit v1.2.3