diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-14 15:49:55 +0300 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-14 15:49:55 +0300 |
| commit | 28abb216cbd5736d65973165b830c08815ce0227 (patch) | |
| tree | 992cf32eb3eb44dd2007c4108e9564c3317725e6 /libavutil/Makefile | |
| parent | eb2da769bddf7e8f4f3202162dacd17c77770dd8 (diff) | |
| parent | 551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4 (diff) | |
Merge commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4'
* commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4':
lavu: VAAPI hwcontext implementation
Merged-by: Derek Buitenhuis <derek.buitenhuis@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 7a3076fe10..a91e7019b3 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -33,6 +33,7 @@ HEADERS = adler32.h \ hmac.h \ hwcontext.h \ hwcontext_cuda.h \ + hwcontext_vaapi.h \ hwcontext_vdpau.h \ imgutils.h \ intfloat.h \ @@ -153,6 +154,7 @@ OBJS-$(!HAVE_ATOMICS_NATIVE) += atomic.o \ OBJS-$(CONFIG_LZO) += lzo.o OBJS-$(CONFIG_OPENCL) += opencl.o opencl_internal.o OBJS-$(CONFIG_CUDA) += hwcontext_cuda.o +OBJS-$(CONFIG_VAAPI) += hwcontext_vaapi.o OBJS-$(CONFIG_VDPAU) += hwcontext_vdpau.o OBJS += $(COMPAT_OBJS:%=../compat/%) @@ -161,6 +163,7 @@ OBJS += $(COMPAT_OBJS:%=../compat/%) SLIBOBJS-$(HAVE_GNU_WINDRES) += avutilres.o SKIPHEADERS-$(CONFIG_CUDA) += hwcontext_cuda.h +SKIPHEADERS-$(CONFIG_VAAPI) += hwcontext_vaapi.h SKIPHEADERS-$(CONFIG_VDPAU) += hwcontext_vdpau.h SKIPHEADERS-$(HAVE_ATOMICS_GCC) += atomic_gcc.h SKIPHEADERS-$(HAVE_ATOMICS_SUNCC) += atomic_suncc.h |