Merge commit '4dc9f00365853b1239936d771856cf1881b5c5ce'

* commit '4dc9f00365853b1239936d771856cf1881b5c5ce':
  build: Skip libvpx.h if libvpx is not enabled

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavcodec/Makefile
index 89216ec0793c4b936ed94a6336e71cf71d9adc77,2fbcc0922a1e89c8a1853de290c563ec5d66ae28..20a20025fe30f266c82dcbb84a7b499a31e1563e
--- 1/libavcodec/Makefile
--- 2/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -915,8 -755,9 +915,9 @@@ SKIPHEADERS                            
  SKIPHEADERS-$(CONFIG_D3D11VA)          += d3d11va.h dxva2_internal.h
  SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
  SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
 -SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
 -SKIPHEADERS-$(CONFIG_NVENC)            += nvenc.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
  SKIPHEADERS-$(CONFIG_QSVENC)           += qsvenc.h