diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-07 12:31:14 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-07 12:31:14 +0200 |
| commit | d4f63be92b4a8252c37f9453f4e406b94092e122 (patch) | |
| tree | 4f33a62593630e446ede78a5312201bfa67891f6 | |
| parent | a92bd1901fc0bdae562c2cd5e8b1ceddf1464370 (diff) | |
| parent | 4dc9f00365853b1239936d771856cf1881b5c5ce (diff) | |
| download | ffmpeg-d4f63be92b4a8252c37f9453f4e406b94092e122.tar.gz | |
Merge commit '4dc9f00365853b1239936d771856cf1881b5c5ce'
* commit '4dc9f00365853b1239936d771856cf1881b5c5ce':
build: Skip libvpx.h if libvpx is not enabled
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | libavcodec/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 89216ec079..20a20025fe 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -916,6 +916,7 @@ SKIPHEADERS-$(CONFIG_D3D11VA) += d3d11va.h dxva2_internal.h SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h SKIPHEADERS-$(CONFIG_LIBUTVIDEO) += libutvideo.h +SKIPHEADERS-$(CONFIG_LIBVPX) += libvpx.h SKIPHEADERS-$(CONFIG_LIBWEBP_ENCODER) += libwebpenc_common.h SKIPHEADERS-$(CONFIG_QSV) += qsv.h qsv_internal.h SKIPHEADERS-$(CONFIG_QSVDEC) += qsvdec.h |