[FFmpeg-cvslog] Merge commit 'fc368497f2fff54ddf5316224c573c9d1939fb25'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Apr 17 13:45:21 2017 +0200| [17f848ca074897885cc21cf1ac38a61f7c3f9770] | committer: Clément Bœsch

Merge commit 'fc368497f2fff54ddf5316224c573c9d1939fb25'

* commit 'fc368497f2fff54ddf5316224c573c9d1939fb25':
  configure: Add missing dxva2 dependency for dxva2_lib

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17f848ca074897885cc21cf1ac38a61f7c3f9770
---

 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index 821dbcba25..c3cc32dc3a 100755
--- a/configure
+++ b/configure
@@ -2579,6 +2579,7 @@ cuvid_deps="cuda"
 d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder ID3D11VideoContext"
 dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode"
 dxva2_extralibs="-luser32"
+dxva2_lib_deps="dxva2"
 vda_framework_deps="VideoDecodeAcceleration_VDADecoder_h"
 vda_framework_extralibs="-framework VideoDecodeAcceleration"
 vda_deps="vda_framework pthreads"


======================================================================

diff --cc configure
index 821dbcba25,6d809f7780..c3cc32dc3a
--- a/configure
+++ b/configure
@@@ -2560,32 -2119,18 +2560,33 @@@ wmv2_decoder_select="blockdsp error_res
  wmv2_encoder_select="h263_encoder wmv2dsp"
  wmv3_decoder_select="vc1_decoder"
  wmv3image_decoder_select="wmv3_decoder"
 -zerocodec_decoder_deps="zlib"
 -zlib_decoder_deps="zlib"
 -zlib_encoder_deps="zlib"
 -zmbv_decoder_deps="zlib"
 -zmbv_encoder_deps="zlib"
 +xma1_decoder_select="wmapro_decoder"
 +xma2_decoder_select="wmapro_decoder"
 +zerocodec_decoder_select="zlib"
 +zlib_decoder_select="zlib"
 +zlib_encoder_select="zlib"
 +zmbv_decoder_select="zlib"
 +zmbv_encoder_select="zlib"
 +
 +# platform codecs
 +audiotoolbox_deps="AudioToolbox_AudioToolbox_h"
 +audiotoolbox_extralibs="-framework CoreFoundation -framework AudioToolbox -framework CoreMedia"
  
  # hardware accelerators
 -d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder"
 +crystalhd_deps="libcrystalhd_libcrystalhd_if_h"
 +cuda_deps_any="dlopen LoadLibrary"
 +cuvid_deps="cuda"
 +d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder ID3D11VideoContext"
  dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode"
 +dxva2_extralibs="-luser32"
+ dxva2_lib_deps="dxva2"
 -vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"
 -vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore"
 +vda_framework_deps="VideoDecodeAcceleration_VDADecoder_h"
 +vda_framework_extralibs="-framework VideoDecodeAcceleration"
 +vda_deps="vda_framework pthreads"
 +vda_extralibs="-framework CoreFoundation -framework QuartzCore"
 +videotoolbox_hwaccel_deps="videotoolbox pthreads"
 +videotoolbox_hwaccel_extralibs="-framework QuartzCore"
 +xvmc_deps="X11_extensions_XvMClib_h"
  
  h263_vaapi_hwaccel_deps="vaapi"
  h263_vaapi_hwaccel_select="h263_decoder"