videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

d3d11va: make av_d3d11va_alloc_context() available at all times 

The public API should not depend on the build configuration.
This commit is contained in:
Anton Khirnov 2015-09-27 20:54:01 +02:00
parent f320287159
commit bb198c4997
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/Makefile
View File

@ -19,6 +19,7 @@ OBJS = allcodecs.o \
bitstream.o \
bitstream_filter.o \
codec_desc.o \
d3d11va.o \
dv_profile.o \
imgconvert.o \
log2_tab.o \
@ -582,7 +583,7 @@ OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER) += adpcm.o adpcm_data.o
OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcmenc.o adpcm_data.o
# hardware accelerators
OBJS-$(CONFIG_D3D11VA) += d3d11va.o dxva2.o
OBJS-$(CONFIG_D3D11VA) += dxva2.o
OBJS-$(CONFIG_DXVA2) += dxva2.o
OBJS-$(CONFIG_VAAPI) += vaapi.o
OBJS-$(CONFIG_VDA) += vda.o

10
libavcodec/d3d11va.c
View File

@ -23,6 +23,8 @@
#include <stddef.h>
#include "config.h"
#if CONFIG_D3D11VA
#include "libavutil/error.h"
#include "libavutil/mem.h"
@ -36,3 +38,11 @@ AVD3D11VAContext *av_d3d11va_alloc_context(void)
res->context_mutex = INVALID_HANDLE_VALUE;
return res;
}
#else
struct AVD3D11VAContext *av_d3d11va_alloc_context(void);
struct AVD3D11VAContext *av_d3d11va_alloc_context(void)
{
return NULL;
}
#endif /* CONFIG_D3D11VA */