diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-22 22:38:49 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-22 22:38:49 +0200 |
| commit | 3689efea3d59579291ecafccc3d9cbe720e7bea3 (patch) | |
| tree | 7bde9ce5ad61c7b9fe7f5bb0e23ea17a0adc90f5 /libavutil/Makefile | |
| parent | d0b21b28a3d348c0302c98cee23c4820cd13e1e2 (diff) | |
| parent | c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8 (diff) | |
| download | ffmpeg-3689efea3d59579291ecafccc3d9cbe720e7bea3.tar.gz | |
Merge commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8'
* commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8':
hwcontext: add a dxva2 implementation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavutil/Makefile')
| -rw-r--r-- | libavutil/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index 1f05215ee5..1e061763a2 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -34,6 +34,7 @@ HEADERS = adler32.h \ hmac.h \ hwcontext.h \ hwcontext_cuda.h \ + hwcontext_dxva2.h \ hwcontext_vaapi.h \ hwcontext_vdpau.h \ imgutils.h \ @@ -152,6 +153,7 @@ OBJS = adler32.o \ OBJS-$(!HAVE_ATOMICS_NATIVE) += atomic.o \ OBJS-$(CONFIG_CUDA) += hwcontext_cuda.o +OBJS-$(CONFIG_DXVA2) += hwcontext_dxva2.o OBJS-$(CONFIG_LZO) += lzo.o OBJS-$(CONFIG_OPENCL) += opencl.o opencl_internal.o OBJS-$(CONFIG_VAAPI) += hwcontext_vaapi.o @@ -163,6 +165,7 @@ OBJS += $(COMPAT_OBJS:%=../compat/%) SLIBOBJS-$(HAVE_GNU_WINDRES) += avutilres.o SKIPHEADERS-$(CONFIG_CUDA) += hwcontext_cuda.h +SKIPHEADERS-$(CONFIG_DXVA2) += hwcontext_dxva2.h SKIPHEADERS-$(CONFIG_VAAPI) += hwcontext_vaapi.h SKIPHEADERS-$(CONFIG_VDPAU) += hwcontext_vdpau.h SKIPHEADERS-$(HAVE_ATOMICS_GCC) += atomic_gcc.h |