Merge commit 'bb198c4997d5036f3bf91de51e44f807115677d0'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 5 Oct 2015 09:18:31 +0000 (11:18 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 5 Oct 2015 09:18:31 +0000 (11:18 +0200)
* commit 'bb198c4997d5036f3bf91de51e44f807115677d0':
  d3d11va: make av_d3d11va_alloc_context() available at all times

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/Makefile
libavcodec/d3d11va.c

@@@ -24,8 -19,10 +24,9 @@@ OBJS = allcodecs.
         bitstream.o                                                      \
         bitstream_filter.o                                               \
         codec_desc.o                                                     \
+        d3d11va.o                                                        \
         dv_profile.o                                                     \
         imgconvert.o                                                     \
 -       log2_tab.o                                                       \
         mathtables.o                                                     \
         options.o                                                        \
         parser.o                                                         \
@@@ -698,11 -583,10 +699,11 @@@ OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER
  OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER)       += adpcmenc.o adpcm_data.o
  
  # hardware accelerators
- OBJS-$(CONFIG_D3D11VA)                    += d3d11va.o dxva2.o
+ OBJS-$(CONFIG_D3D11VA)                    += dxva2.o
  OBJS-$(CONFIG_DXVA2)                      += dxva2.o
  OBJS-$(CONFIG_VAAPI)                      += vaapi.o
 -OBJS-$(CONFIG_VDA)                        += vda.o
 +OBJS-$(CONFIG_VDA)                        += vda.o videotoolbox.o
 +OBJS-$(CONFIG_VIDEOTOOLBOX)               += videotoolbox.o
  OBJS-$(CONFIG_VDPAU)                      += vdpau.o
  
  OBJS-$(CONFIG_H263_VAAPI_HWACCEL)         += vaapi_mpeg4.o
Simple merge