har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hwcontext_d3d11va: fix crash on frames_init failure

Browse Source 
It appears in this case, frames_ininit is called twice (once by
av_hwframe_ctx_init(), and again by unreffing the frames ctx ref).

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
wm4 2017-06-22 14:52:54 +02:00 committed by Luca Barbato
parent 752ddb4556
commit 086321c612
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/hwcontext_d3d11va.c
View File

@ -104,9 +104,11 @@ static void d3d11va_frames_uninit(AVHWFramesContext *ctx)
if (frames_hwctx->texture) if (frames_hwctx->texture)
ID3D11Texture2D_Release(frames_hwctx->texture); ID3D11Texture2D_Release(frames_hwctx->texture);
frames_hwctx->texture = NULL;
if (s->staging_texture) if (s->staging_texture)
ID3D11Texture2D_Release(s->staging_texture); ID3D11Texture2D_Release(s->staging_texture);
s->staging_texture = NULL;
} }
static void free_texture(void *opaque, uint8_t *data) static void free_texture(void *opaque, uint8_t *data)