Merge commit 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 20:49:51 +0000 (21:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 20:49:51 +0000 (21:49 +0100)
* commit 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41':
  qsv: Skip qsv.h compilation if qsv is not enabled

Conflicts:
libavcodec/Makefile

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

@@@ -861,9 -717,8 +861,9 @@@ 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_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
  SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h vdpau_internal.h