mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'bb198c4997d5036f3bf91de51e44f807115677d0'
* commit 'bb198c4997d5036f3bf91de51e44f807115677d0': d3d11va: make av_d3d11va_alloc_context() available at all times Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
commit
0cd8170dd2
|
@ -24,6 +24,7 @@ OBJS = allcodecs.o \
|
||||||
bitstream.o \
|
bitstream.o \
|
||||||
bitstream_filter.o \
|
bitstream_filter.o \
|
||||||
codec_desc.o \
|
codec_desc.o \
|
||||||
|
d3d11va.o \
|
||||||
dv_profile.o \
|
dv_profile.o \
|
||||||
imgconvert.o \
|
imgconvert.o \
|
||||||
mathtables.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
|
OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcmenc.o adpcm_data.o
|
||||||
|
|
||||||
# hardware accelerators
|
# hardware accelerators
|
||||||
OBJS-$(CONFIG_D3D11VA) += d3d11va.o dxva2.o
|
OBJS-$(CONFIG_D3D11VA) += dxva2.o
|
||||||
OBJS-$(CONFIG_DXVA2) += dxva2.o
|
OBJS-$(CONFIG_DXVA2) += dxva2.o
|
||||||
OBJS-$(CONFIG_VAAPI) += vaapi.o
|
OBJS-$(CONFIG_VAAPI) += vaapi.o
|
||||||
OBJS-$(CONFIG_VDA) += vda.o videotoolbox.o
|
OBJS-$(CONFIG_VDA) += vda.o videotoolbox.o
|
||||||
|
|
|
@ -23,6 +23,8 @@
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
#if CONFIG_D3D11VA
|
||||||
#include "libavutil/error.h"
|
#include "libavutil/error.h"
|
||||||
#include "libavutil/mem.h"
|
#include "libavutil/mem.h"
|
||||||
|
|
||||||
|
@ -36,3 +38,11 @@ AVD3D11VAContext *av_d3d11va_alloc_context(void)
|
||||||
res->context_mutex = INVALID_HANDLE_VALUE;
|
res->context_mutex = INVALID_HANDLE_VALUE;
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
struct AVD3D11VAContext *av_d3d11va_alloc_context(void);
|
||||||
|
|
||||||
|
struct AVD3D11VAContext *av_d3d11va_alloc_context(void)
|
||||||
|
{
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
#endif /* CONFIG_D3D11VA */
|
||||||
|
|
Loading…
Reference in New Issue