ffmpeg_vaapi: Always set hwaccel_ctx, so it gets properly cleaned up on error
authorMark Thompson <sw@jkqxz.net>
Sun, 22 Jan 2017 18:25:53 +0000 (18:25 +0000)
committerMark Thompson <sw@jkqxz.net>
Sun, 5 Feb 2017 15:13:15 +0000 (15:13 +0000)
Fixes CID 1398954.

ffmpeg_vaapi.c

index 6530908..d011cac 100644 (file)
@@ -157,6 +157,7 @@ int vaapi_decode_init(AVCodecContext *avctx)
     if (!ctx)
         return AVERROR(ENOMEM);
     ctx->class = &vaapi_class;
+    ist->hwaccel_ctx = ctx;
 
     ctx->device_ref = av_buffer_ref(hw_device_ctx);
     ctx->device = (AVHWDeviceContext*)ctx->device_ref->data;
@@ -202,7 +203,6 @@ int vaapi_decode_init(AVCodecContext *avctx)
         goto fail;
     }
 
-    ist->hwaccel_ctx           = ctx;
     ist->hwaccel_uninit        = &vaapi_decode_uninit;
     ist->hwaccel_get_buffer    = &vaapi_get_buffer;
     ist->hwaccel_retrieve_data = &vaapi_retrieve_data;