Merge commit 'd847a40888c064cc8c35b546fc5a0ccb69136a7c'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 17:24:04 +0000 (17:24 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 17:24:04 +0000 (17:24 +0000)
* commit 'd847a40888c064cc8c35b546fc5a0ccb69136a7c':
  hwcontext_cuda/vdpau: add to skipheaders

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
libavutil/Makefile

@@@ -157,9 -112,8 +157,11 @@@ OBJS-$(CONFIG_VDPAU
  
  OBJS += $(COMPAT_OBJS:%=../compat/%)
  
 +# Windows resource file
 +SLIBOBJS-$(HAVE_GNU_WINDRES)            += avutilres.o
 +
+ SKIPHEADERS-$(CONFIG_CUDA)             += hwcontext_cuda.h
+ SKIPHEADERS-$(CONFIG_VDPAU)            += hwcontext_vdpau.h
  SKIPHEADERS-$(HAVE_ATOMICS_GCC)        += atomic_gcc.h
  SKIPHEADERS-$(HAVE_ATOMICS_SUNCC)      += atomic_suncc.h
  SKIPHEADERS-$(HAVE_ATOMICS_WIN32)      += atomic_win32.h