hwcontext_d3d11va: fix crash on frames_init failure
authorwm4 <nfxjfg@googlemail.com>
Thu, 22 Jun 2017 12:52:54 +0000 (14:52 +0200)
committerwm4 <nfxjfg@googlemail.com>
Tue, 27 Jun 2017 16:05:02 +0000 (18:05 +0200)
It appears in this case, frames_ininit is called twice (once by
av_hwframe_ctx_init(), and again by unreffing the frames ctx ref).

Merges Libav commit 086321c612185469ebb85a1887527c8915b488b7.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
libavutil/hwcontext_d3d11va.c

index 5432dd8..0b36a56 100644 (file)
@@ -104,9 +104,11 @@ static void d3d11va_frames_uninit(AVHWFramesContext *ctx)
 
     if (frames_hwctx->texture)
         ID3D11Texture2D_Release(frames_hwctx->texture);
+    frames_hwctx->texture = NULL;
 
     if (s->staging_texture)
         ID3D11Texture2D_Release(s->staging_texture);
+    s->staging_texture = NULL;
 }
 
 static void free_texture(void *opaque, uint8_t *data)