From c89c96e98964fbc53fd34ba354f20b358e5ba46c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Mon, 19 Apr 2010 12:49:51 +0000 Subject: [PATCH] configure: simplify vdpau dependencies Originally committed as revision 22909 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 25e8cef076..c61d435dca 100755 --- a/configure +++ b/configure @@ -1238,7 +1238,6 @@ h264_dxva2_hwaccel_deps="dxva2api_h" h264_dxva2_hwaccel_select="dxva2 h264_decoder" h264_vaapi_hwaccel_deps="va_va_h" h264_vaapi_hwaccel_select="vaapi" -h264_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" h264_vdpau_decoder_select="vdpau h264_decoder" imc_decoder_select="fft mdct" jpegls_decoder_select="golomb" @@ -1251,15 +1250,12 @@ mpeg1video_encoder_select="aandct" mpeg2video_encoder_select="aandct" mpeg4_decoder_select="h263_decoder mpeg4video_parser" mpeg4_encoder_select="h263_encoder" -mpeg_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" mpeg_vdpau_decoder_select="vdpau mpegvideo_decoder" -mpeg1_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" mpeg1_vdpau_decoder_select="vdpau mpeg1video_decoder" mpeg2_vaapi_hwaccel_deps="va_va_h" mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder" mpeg4_vaapi_hwaccel_deps="va_va_h" mpeg4_vaapi_hwaccel_select="vaapi mpeg4_decoder" -mpeg4_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" mpeg4_vdpau_decoder_select="vdpau mpeg4_decoder" mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h" mpeg_xvmc_decoder_select="mpegvideo_decoder" @@ -1302,7 +1298,6 @@ vc1_dxva2_hwaccel_deps="dxva2api_h DXVA_PictureParameters_wDecodedPictureIndex" vc1_dxva2_hwaccel_select="dxva2 vc1_decoder" vc1_vaapi_hwaccel_deps="va_va_h" vc1_vaapi_hwaccel_select="vaapi vc1_decoder" -vc1_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" vc1_vdpau_decoder_select="vdpau vc1_decoder" vorbis_decoder_select="mdct" vorbis_encoder_select="mdct" @@ -1327,6 +1322,8 @@ zlib_encoder_select="zlib" zmbv_decoder_select="zlib" zmbv_encoder_select="zlib" +vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" + # parsers h264_parser_select="golomb h264dsp"