Merge commit '7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Mar 2015 18:31:50 +0000 (20:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Mar 2015 18:31:50 +0000 (20:31 +0200)
* commit '7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161':
  qsv: Skip header compilation depending on what parts of qsv are enabled

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/Makefile

@@@ -868,9 -723,10 +868,11 @@@ SKIPHEADERS                            
  
  SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
  SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
 -SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.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
  SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h vdpau_internal.h