diff options
| author | James Zern <jzern@google.com> | 2014-08-12 21:11:36 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-08-12 21:11:36 -0700 |
| commit | 80b6c9c56fe963c87cd24cdfc476bc4242d4674f (patch) | |
| tree | 73e1c8e977ef8ecb8740fc43c30c169dff26688f /vp9 | |
| parent | bcb97ec647baedea85444ba89b1b1d9f551d5875 (diff) | |
| parent | 7d9da93a973d53c65db8f174b2a70297a9d2a49f (diff) | |
| download | libvpx-80b6c9c56fe963c87cd24cdfc476bc4242d4674f.tar libvpx-80b6c9c56fe963c87cd24cdfc476bc4242d4674f.tar.gz libvpx-80b6c9c56fe963c87cd24cdfc476bc4242d4674f.tar.bz2 libvpx-80b6c9c56fe963c87cd24cdfc476bc4242d4674f.zip | |
Merge "VP8D_GET_FRAME_CORRUPTED: check frame pointer"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/vp9_dx_iface.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/vp9/vp9_dx_iface.c b/vp9/vp9_dx_iface.c index bc7801152..4372ac9e5 100644 --- a/vp9/vp9_dx_iface.c +++ b/vp9/vp9_dx_iface.c @@ -639,11 +639,10 @@ static vpx_codec_err_t ctrl_get_frame_corrupted(vpx_codec_alg_priv_t *ctx, va_list args) { int *corrupted = va_arg(args, int *); - if (corrupted) { - if (ctx->pbi) - *corrupted = ctx->pbi->common.frame_to_show->corrupted; - else - return VPX_CODEC_ERROR; + if (corrupted != NULL && ctx->pbi != NULL) { + const YV12_BUFFER_CONFIG *const frame = ctx->pbi->common.frame_to_show; + if (frame == NULL) return VPX_CODEC_ERROR; + *corrupted = frame->corrupted; return VPX_CODEC_OK; } else { return VPX_CODEC_INVALID_PARAM; |