diff options
| author | Deb Mukherjee <debargha@google.com> | 2014-05-23 11:01:09 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-23 11:01:09 -0700 |
| commit | 6bfbb691e2b84a5e753ee391cdd932fbeabafb42 (patch) | |
| tree | f11156b3fabf43b7fb7bf2dba97d2a17006297dd | |
| parent | 52b32ad025ddc50f095058fc9755c28488306ae4 (diff) | |
| parent | caba78ef49e8cc2250ea79c2d21e5e3710354199 (diff) | |
| download | libvpx-6bfbb691e2b84a5e753ee391cdd932fbeabafb42.tar libvpx-6bfbb691e2b84a5e753ee391cdd932fbeabafb42.tar.gz libvpx-6bfbb691e2b84a5e753ee391cdd932fbeabafb42.tar.bz2 libvpx-6bfbb691e2b84a5e753ee391cdd932fbeabafb42.zip | |
Merge "Fixes a bug for uninitialized frame buffers"
| -rw-r--r-- | vp8/vp8_dx_iface.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vp8/vp8_dx_iface.c b/vp8/vp8_dx_iface.c index 10cbc6a58..d6dfb1643 100644 --- a/vp8/vp8_dx_iface.c +++ b/vp8/vp8_dx_iface.c @@ -386,8 +386,10 @@ static vpx_codec_err_t vp8_decode(vpx_codec_alg_priv_t *ctx, /* 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) { |