avcodec/vdpau: do not dereference hwctx before checking it for NULL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/87/head
Michael Niedermayer 10 years ago
parent 4d8356b678
commit 67ddf21611
  1. 2
      libavcodec/vdpau.c

@ -89,7 +89,6 @@ int ff_vdpau_common_init(AVCodecContext *avctx, VdpDecoderProfile profile,
vdctx->width = UINT32_MAX; vdctx->width = UINT32_MAX;
vdctx->height = UINT32_MAX; vdctx->height = UINT32_MAX;
hwctx->reset = 0;
if (!hwctx) { if (!hwctx) {
vdctx->device = VDP_INVALID_HANDLE; vdctx->device = VDP_INVALID_HANDLE;
@ -103,6 +102,7 @@ int ff_vdpau_common_init(AVCodecContext *avctx, VdpDecoderProfile profile,
vdctx->device = VDP_INVALID_HANDLE; vdctx->device = VDP_INVALID_HANDLE;
return 0; /* Decoder created by user */ return 0; /* Decoder created by user */
} }
hwctx->reset = 0;
vdctx->device = hwctx->device; vdctx->device = hwctx->device;
vdctx->get_proc_address = hwctx->get_proc_address; vdctx->get_proc_address = hwctx->get_proc_address;

Loading…
Cancel
Save