diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 21:49:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 21:49:51 +0100 |
| commit | 9ad8f55edaf20a73ebf42ad9f0398e96a1726690 (patch) | |
| tree | 655dc38d5590a7d68937cd1000144bf2a93b996d /libavcodec/Makefile | |
| parent | 83f18410bdcf149b58fb669cda65b1cdcdebf695 (diff) | |
| parent | cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41 (diff) | |
Merge commit 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41'
* commit 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41':
qsv: Skip qsv.h compilation if qsv is not enabled
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index e10cc16cf2..27b70bdd98 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -862,7 +862,7 @@ 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_internal.h +SKIPHEADERS-$(CONFIG_QSV) += qsv.h qsv_internal.h SKIPHEADERS-$(CONFIG_XVMC) += xvmc.h SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h SKIPHEADERS-$(CONFIG_VDA) += vda.h vda_internal.h |