aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-09-27 20:54:01 +0200
committerAnton Khirnov <anton@khirnov.net>2015-10-03 14:09:23 +0200
commitbb198c4997d5036f3bf91de51e44f807115677d0 (patch)
tree7fd4337395220ea240f2d1d087d912a41b2bdbd4 /libavcodec
parentf3202871598f59b570b31b01cfeb64b8fedbd700 (diff)
downloadffmpeg-bb198c4997d5036f3bf91de51e44f807115677d0.tar.gz
d3d11va: make av_d3d11va_alloc_context() available at all times
The public API should not depend on the build configuration.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/Makefile3
-rw-r--r--libavcodec/d3d11va.c10
2 files changed, 12 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 632a8a64d1..ba711ae07d 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -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
diff --git a/libavcodec/d3d11va.c b/libavcodec/d3d11va.c
index eea01b8ae5..946de06cf1 100644
--- a/libavcodec/d3d11va.c
+++ b/libavcodec/d3d11va.c
@@ -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 */