diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-30 20:31:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-30 20:31:50 +0200 |
| commit | f5c7531ab1e69210df69b07ac6b21cb675f13b9e (patch) | |
| tree | 9d8b27e3c8ab247a8097ee2919798f773cef58ba /libavcodec/Makefile | |
| parent | 0187c2ccda3b00d22797170bf5675318dd0f675a (diff) | |
| parent | 7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161 (diff) | |
Merge commit '7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161'
* commit '7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161':
qsv: Skip header compilation depending on what parts of qsv are enabled
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index db0c1e30d6..e73005d816 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -869,7 +869,9 @@ SKIPHEADERS += %_tablegen.h \ SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h SKIPHEADERS-$(CONFIG_LIBUTVIDEO) += libutvideo.h -SKIPHEADERS-$(CONFIG_QSV) += qsv.h qsvdec.h qsvenc.h qsv_internal.h +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_internal.h SKIPHEADERS-$(CONFIG_VDA) += vda.h vda_internal.h |