diff options
| author | Mark Thompson <sw@jkqxz.net> | 2016-08-06 18:18:40 +0100 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2017-01-17 23:06:45 +0000 |
| commit | 79307ae56374b35cf12563a7c8e3e759658f847e (patch) | |
| tree | aeb4c0408e75b2b31a87a11de1595b1ffd2dd36a /libavcodec/Makefile | |
| parent | d07d01bcce4dd145d04bd936b5d2d268ed688e3f (diff) | |
lavc: Rewrite VAAPI decode infrastructure
Moves much of the setup logic for VAAPI decoding into lavc; the user
now need only provide the hw_frames_ctx.
(cherry picked from commit 123ccd07c55ccf075cc5daf5581237fbccb86bdb)
(cherry picked from commit 5e879b54a3a46817ea6c8a95a9aecab1176418b9)
(cherry picked from commit 0aec37e625821040c103641eec9c1e7a1efa2952)
(cherry picked from commit cfa4eb4fba782f3f37a33be997b27a91a07053c9)
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index ee4294bd9a..3a8238d3cc 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -771,7 +771,7 @@ OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcmenc.o adpcm_data.o # hardware accelerators OBJS-$(CONFIG_D3D11VA) += dxva2.o OBJS-$(CONFIG_DXVA2) += dxva2.o -OBJS-$(CONFIG_VAAPI) += vaapi.o +OBJS-$(CONFIG_VAAPI) += vaapi.o vaapi_decode.o OBJS-$(CONFIG_VDA) += vda.o videotoolbox.o OBJS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.o OBJS-$(CONFIG_VDPAU) += vdpau.o @@ -1003,7 +1003,8 @@ SKIPHEADERS-$(CONFIG_QSV) += qsv.h qsv_internal.h SKIPHEADERS-$(CONFIG_QSVDEC) += qsvdec.h SKIPHEADERS-$(CONFIG_QSVENC) += qsvenc.h SKIPHEADERS-$(CONFIG_XVMC) += xvmc.h -SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_encode.h vaapi_internal.h +SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_decode.h vaapi_encode.h \ + vaapi_internal.h SKIPHEADERS-$(CONFIG_VDA) += vda.h vda_vt_internal.h SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.h vda_vt_internal.h |