ffmpeg | branch: master | Mark Thompson <s...@jkqxz.net> | Sun Jan 22 18:25:53 2017 +0000| [55a7e7e3986e661f4b02164739c1ea4eaf83f9cf] | committer: Mark Thompson
ffmpeg_vaapi: Always set hwaccel_ctx, so it gets properly cleaned up on error Fixes CID 1398954. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=55a7e7e3986e661f4b02164739c1ea4eaf83f9cf --- ffmpeg_vaapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg_vaapi.c b/ffmpeg_vaapi.c index 6530908..d011cac 100644 --- a/ffmpeg_vaapi.c +++ b/ffmpeg_vaapi.c @@ -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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
