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

avutil/hwcontext_dxva.c: Use new safe dlopen code.

Browse Source 
Signed-off-by: Matt Oliver <protogonoi@gmail.com>
This commit is contained in:
Matt Oliver
2016-10-29 18:25:05 +11:00
parent 85553b42f9
commit 85db1f97eb
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavutil/hwcontext_dxva2.c
View File

@@ -37,6 +37,7 @@
#include "imgutils.h" #include "imgutils.h"
#include "pixdesc.h" #include "pixdesc.h"
#include "pixfmt.h" #include "pixfmt.h"
#include "compat/w32dlfcn.h"
typedef IDirect3D9* WINAPI pDirect3DCreate9(UINT); typedef IDirect3D9* WINAPI pDirect3DCreate9(UINT);
typedef HRESULT WINAPI pCreateDeviceManager9(UINT *, IDirect3DDeviceManager9 **); typedef HRESULT WINAPI pCreateDeviceManager9(UINT *, IDirect3DDeviceManager9 **);
@@ -318,10 +319,10 @@ static void dxva2_device_free(AVHWDeviceContext *ctx)
IDirect3D9_Release(priv->d3d9); IDirect3D9_Release(priv->d3d9);
if (priv->d3dlib) if (priv->d3dlib)
FreeLibrary(priv->d3dlib); dlclose(priv->d3dlib);
if (priv->dxva2lib) if (priv->dxva2lib)
FreeLibrary(priv->dxva2lib); dlclose(priv->dxva2lib);
av_freep(&ctx->user_opaque); av_freep(&ctx->user_opaque);
} }
@@ -352,23 +353,23 @@ static int dxva2_device_create(AVHWDeviceContext *ctx, const char *device,
priv->device_handle = INVALID_HANDLE_VALUE; priv->device_handle = INVALID_HANDLE_VALUE;
priv->d3dlib = LoadLibrary("d3d9.dll"); priv->d3dlib = dlopen("d3d9.dll", 0);
if (!priv->d3dlib) { if (!priv->d3dlib) {
av_log(ctx, AV_LOG_ERROR, "Failed to load D3D9 library\n"); av_log(ctx, AV_LOG_ERROR, "Failed to load D3D9 library\n");
return AVERROR_UNKNOWN; return AVERROR_UNKNOWN;
} }
priv->dxva2lib = LoadLibrary("dxva2.dll"); priv->dxva2lib = dlopen("dxva2.dll", 0);
if (!priv->dxva2lib) { if (!priv->dxva2lib) {
av_log(ctx, AV_LOG_ERROR, "Failed to load DXVA2 library\n"); av_log(ctx, AV_LOG_ERROR, "Failed to load DXVA2 library\n");
return AVERROR_UNKNOWN; return AVERROR_UNKNOWN;
} }
createD3D = (pDirect3DCreate9 *)GetProcAddress(priv->d3dlib, "Direct3DCreate9"); createD3D = (pDirect3DCreate9 *)dlsym(priv->d3dlib, "Direct3DCreate9");
if (!createD3D) { if (!createD3D) {
av_log(ctx, AV_LOG_ERROR, "Failed to locate Direct3DCreate9\n"); av_log(ctx, AV_LOG_ERROR, "Failed to locate Direct3DCreate9\n");
return AVERROR_UNKNOWN; return AVERROR_UNKNOWN;
} }
createDeviceManager = (pCreateDeviceManager9 *)GetProcAddress(priv->dxva2lib, createDeviceManager = (pCreateDeviceManager9 *)dlsym(priv->dxva2lib,
"DXVA2CreateDirect3DDeviceManager9"); "DXVA2CreateDirect3DDeviceManager9");
if (!createDeviceManager) { if (!createDeviceManager) {
av_log(ctx, AV_LOG_ERROR, "Failed to locate DXVA2CreateDirect3DDeviceManager9\n"); av_log(ctx, AV_LOG_ERROR, "Failed to locate DXVA2CreateDirect3DDeviceManager9\n");