virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Revert "avutil/hwcontext_vaapi: fix SEGV in vaTerminate when vaInitialize fails"

Browse Source 
The original code is correctly following the API - vaTerminate() must
be called to free the resources of a VADisplay after it is created by
any of the vaGetDisplay*() calls; it is not necessary to have
successfully called vaInitialize() on it.  The segfaults which
prompted this change must therefore be bugs in libva or the driver it
loads.

This reverts commit 3606602f11.
This commit is contained in:
Mark Thompson
2017-02-05 14:58:06 +00:00
parent df3b17eba4
commit 3420b34a8a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavutil/hwcontext_vaapi.c
View File

@@ -961,13 +961,14 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device,
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
hwctx->display = display;
vas = vaInitialize(display, &major, &minor); vas = vaInitialize(display, &major, &minor);
if (vas != VA_STATUS_SUCCESS) { if (vas != VA_STATUS_SUCCESS) {
av_log(ctx, AV_LOG_ERROR, "Failed to initialise VAAPI " av_log(ctx, AV_LOG_ERROR, "Failed to initialise VAAPI "
"connection: %d (%s).\n", vas, vaErrorStr(vas)); "connection: %d (%s).\n", vas, vaErrorStr(vas));
return AVERROR(EIO); return AVERROR(EIO);
} }
hwctx->display = display;
av_log(ctx, AV_LOG_VERBOSE, "Initialised VAAPI connection: " av_log(ctx, AV_LOG_VERBOSE, "Initialised VAAPI connection: "
"version %d.%d\n", major, minor); "version %d.%d\n", major, minor);