ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu May 28 01:01:16 2015 +0200| [cf52e6d012d035b82080e6cc045378f900627870] | committer: Michael Niedermayer
avcodec/ffv1dec: Fix skip_alpha Fixes Ticket4322 Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf52e6d012d035b82080e6cc045378f900627870 --- libavcodec/ffv1dec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index d3927a2..cc7c605 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; _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
