Merge commit '216c44dfc17252ec0681dcb0bbeeb45a9d14eca7'
authorMark Thompson <sw@jkqxz.net>
Wed, 21 Feb 2018 21:51:28 +0000 (21:51 +0000)
committerMark Thompson <sw@jkqxz.net>
Wed, 21 Feb 2018 21:51:28 +0000 (21:51 +0000)
* commit '216c44dfc17252ec0681dcb0bbeeb45a9d14eca7':
  vaapi_encode: Destroy output buffer pool before VA context

Merged-by: Mark Thompson <sw@jkqxz.net>
libavcodec/vaapi_encode.c

index f552071802ab973b286271bf2564c19c24055308..f5785ce4c532c88df3c4b63b0b55a44df864ce52 100644 (file)
@@ -1564,6 +1564,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;
@@ -1574,8 +1576,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);