diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-05 11:18:31 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-05 11:18:31 +0200 |
| commit | 0cd8170dd2b5aa274707aace60a9807ffcff3825 (patch) | |
| tree | 044aa761e659f111d2d058036034947d14c8a354 | |
| parent | ac830e9b489b77d42e11599cbaf588139781da73 (diff) | |
| parent | bb198c4997d5036f3bf91de51e44f807115677d0 (diff) | |
| download | ffmpeg-0cd8170dd2b5aa274707aace60a9807ffcff3825.tar.gz | |
Merge commit 'bb198c4997d5036f3bf91de51e44f807115677d0'
* commit 'bb198c4997d5036f3bf91de51e44f807115677d0':
d3d11va: make av_d3d11va_alloc_context() available at all times
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | libavcodec/Makefile | 3 | ||||
| -rw-r--r-- | libavcodec/d3d11va.c | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 153c3f854e..9075077265 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -24,6 +24,7 @@ OBJS = allcodecs.o \ bitstream.o \ bitstream_filter.o \ codec_desc.o \ + d3d11va.o \ dv_profile.o \ imgconvert.o \ mathtables.o \ @@ -698,7 +699,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 videotoolbox.o diff --git a/libavcodec/d3d11va.c b/libavcodec/d3d11va.c index 7ecda22d37..9967f322c9 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 */ |