summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-08-11 14:57:07 +0200
committerAnton Khirnov <anton@khirnov.net>2015-09-28 15:45:29 +0200
commit3ee462dca1038e63b8e8d5e751121736d5772a5d (patch)
treeb66a888924737322e5e4b1b14040f466ab57e89e /doc
parent2c32eace5ec4d1d7ca4e0220856cd2815ccc71b2 (diff)
examples/qsvdec: do not free the surfaces in the frame_free() callback
Even though libmfx might not need them anymore, avcodec might still access the surfaces. So free them separately at the end.
Diffstat (limited to 'doc')
-rw-r--r--doc/examples/qsvdec.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/doc/examples/qsvdec.c b/doc/examples/qsvdec.c
index 04e5b5f85d..2f26f41ebd 100644
--- a/doc/examples/qsvdec.c
+++ b/doc/examples/qsvdec.c
@@ -116,15 +116,6 @@ fail:
static mfxStatus frame_free(mfxHDL pthis, mfxFrameAllocResponse *resp)
{
- DecodeContext *decode = pthis;
-
- if (decode->surfaces)
- vaDestroySurfaces(decode->va_dpy, decode->surfaces, decode->nb_surfaces);
- av_freep(&decode->surfaces);
- av_freep(&decode->surface_ids);
- av_freep(&decode->surface_used);
- decode->nb_surfaces = 0;
-
return MFX_ERR_NONE;
}
@@ -144,6 +135,16 @@ static mfxStatus frame_get_hdl(mfxHDL pthis, mfxMemId mid, mfxHDL *hdl)
return MFX_ERR_NONE;
}
+static void free_surfaces(DecodeContext *decode)
+{
+ if (decode->surfaces)
+ vaDestroySurfaces(decode->va_dpy, decode->surfaces, decode->nb_surfaces);
+ av_freep(&decode->surfaces);
+ av_freep(&decode->surface_ids);
+ av_freep(&decode->surface_used);
+ decode->nb_surfaces = 0;
+}
+
static void free_buffer(void *opaque, uint8_t *data)
{
int *used = opaque;
@@ -467,6 +468,8 @@ finish:
av_frame_free(&frame);
+ free_surfaces(&decode);
+
if (decode.mfx_session)
MFXClose(decode.mfx_session);
if (decode.va_dpy)