Mercurial > libavcodec.hg

changeset 11254:e820a9d3f80c libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Decode alpha plane in Bink video
author kostya
date Tue, 23 Feb 2010 07:07:54 +0000
parents 100ca092ac34
children f65b3f7186b5
files bink.c
diffstat 1 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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);