# HG changeset patch # User kostya # Date 1266908874 0 # Node ID e820a9d3f80c8e6e0735ae75faac7c9a14a54c8e # Parent 100ca092ac34877f5901d3733b601b566936f782 Decode alpha plane in Bink video diff -r 100ca092ac34 -r e820a9d3f80c bink.c --- a/bink.c Tue Feb 23 07:01:13 2010 +0000 +++ b/bink.c Tue Feb 23 07:07:54 2010 +0000 @@ -911,12 +911,10 @@ init_get_bits(&gb, pkt->data, bits_count); if (c->has_alpha) { - int aplane_bits = get_bits_long(&gb, 32) << 3; - if (aplane_bits <= 32 || (aplane_bits & 0x1F)) { - av_log(avctx, AV_LOG_ERROR, "Incorrect alpha plane size %d\n", aplane_bits); + if (c->version >= 'i') + skip_bits_long(&gb, 32); + if (bink_decode_plane(c, &gb, 3, 0) < 0) return -1; - } - skip_bits_long(&gb, aplane_bits - 32); } if (c->version >= 'i') skip_bits_long(&gb, 32); @@ -977,7 +975,7 @@ return 1; } - avctx->pix_fmt = PIX_FMT_YUV420P; + avctx->pix_fmt = c->has_alpha ? PIX_FMT_YUVA420P : PIX_FMT_YUV420P; avctx->idct_algo = FF_IDCT_BINK; dsputil_init(&c->dsp, avctx);