shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fixes a bug for uninitialized frame buffers"

--- a/vp8/vp8_dx_iface.c

+++ b/vp8/vp8_dx_iface.c

@@ -386,8 +386,10 @@

     /* Set these even if already initialized.  The caller may have changed the

      * decrypt config between frames.

      */

-    ctx->yv12_frame_buffers.pbi[0]->decrypt_cb = ctx->decrypt_cb;

-    ctx->yv12_frame_buffers.pbi[0]->decrypt_state = ctx->decrypt_state;

+    if (ctx->decoder_init) {

+      ctx->yv12_frame_buffers.pbi[0]->decrypt_cb = ctx->decrypt_cb;

+      ctx->yv12_frame_buffers.pbi[0]->decrypt_state = ctx->decrypt_state;

+    }

     if (!res)

     {