diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-17 16:16:34 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-17 16:16:34 +0000 |
| commit | d779d8d771c0a4c3d7bc38ac49bfed3ea3a2e6ed (patch) | |
| tree | c736eabe8a65ea314172e9ea4668a8e348dab3ea /libavutil/Makefile | |
| parent | 1a708780f3d4b431996d118df4e448b4f2a7942e (diff) | |
| parent | a001ce31bc2bcf875a39b5fb22dae49120293b42 (diff) | |
| download | ffmpeg-d779d8d771c0a4c3d7bc38ac49bfed3ea3a2e6ed.tar.gz | |
Merge commit 'a001ce31bc2bcf875a39b5fb22dae49120293b42'
* commit 'a001ce31bc2bcf875a39b5fb22dae49120293b42':
hwcontext: add a VDPAU implementation
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavutil/Makefile')
| -rw-r--r-- | libavutil/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index cec5584684..e6b503aa8c 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -32,6 +32,7 @@ HEADERS = adler32.h \ hash.h \ hmac.h \ hwcontext.h \ + hwcontext_vdpau.h \ imgutils.h \ intfloat.h \ intreadwrite.h \ @@ -150,6 +151,7 @@ OBJS-$(!HAVE_ATOMICS_NATIVE) += atomic.o \ OBJS-$(CONFIG_LZO) += lzo.o OBJS-$(CONFIG_OPENCL) += opencl.o opencl_internal.o +OBJS-$(CONFIG_VDPAU) += hwcontext_vdpau.o OBJS += $(COMPAT_OBJS:%=../compat/%) |