ffmpeg | branch: master | Mark Thompson <s...@jkqxz.net> | Sun Dec 17 19:48:35 2017 +0000| [216c44dfc17252ec0681dcb0bbeeb45a9d14eca7] | committer: Mark Thompson
vaapi_encode: Destroy output buffer pool before VA context The buffers are created associated with the context, so they should be destroyed before the context is. This is enforced by the iHD driver. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=216c44dfc17252ec0681dcb0bbeeb45a9d14eca7 --- libavcodec/vaapi_encode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index c6113b1de5..398b8e11f2 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1556,6 +1556,8 @@ av_cold int ff_vaapi_encode_close(AVCodecContext *avctx) vaapi_encode_free(avctx, pic); } + av_buffer_pool_uninit(&ctx->output_buffer_pool); + if (ctx->va_context != VA_INVALID_ID) { vaDestroyContext(ctx->hwctx->display, ctx->va_context); ctx->va_context = VA_INVALID_ID; @@ -1566,8 +1568,6 @@ av_cold int ff_vaapi_encode_close(AVCodecContext *avctx) ctx->va_config = VA_INVALID_ID; } - av_buffer_pool_uninit(&ctx->output_buffer_pool); - av_freep(&ctx->codec_sequence_params); av_freep(&ctx->codec_picture_params); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
