From 711dae776f710ff12c7992dbf1028e42fd35b7ef Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 6 Mar 2009 10:18:39 +0000 Subject: [PATCH] Get rid of redundant vdpau option, decoders can still be disabled individually. Originally committed as revision 17855 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 1e804e16d2..4abedc7811 100755 --- a/configure +++ b/configure @@ -88,7 +88,6 @@ show_help(){ echo " --enable-pthreads use pthreads [no]" echo " --enable-w32threads use Win32 threads [no]" echo " --enable-x11grab enable X11 grabbing [no]" - echo " --enable-vdpau enable VDPAU support [no]" echo " --disable-network disable network support [no]" echo " --disable-ipv6 disable IPv6 support [no]" echo " --disable-mpegaudio-hp faster (but less accurate) MPEG audio decoding [no]" @@ -803,7 +802,6 @@ CONFIG_LIST=" shared small static - vdpau x11grab zlib " @@ -1011,7 +1009,7 @@ h261_encoder_select="aandct" h263_encoder_select="aandct" h263p_encoder_select="aandct" h264_decoder_select="golomb" -h264_vdpau_decoder_deps="vdpau" +h264_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" imc_decoder_select="fft mdct" jpegls_decoder_select="golomb" jpegls_encoder_select="golomb" @@ -1021,8 +1019,8 @@ mjpeg_encoder_select="aandct" mpeg1video_encoder_select="aandct" mpeg2video_encoder_select="aandct" mpeg4_encoder_select="aandct" -mpeg_vdpau_decoder_deps="vdpau" -mpeg1_vdpau_decoder_deps="vdpau" +mpeg_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" +mpeg1_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h" msmpeg4v1_encoder_select="aandct" msmpeg4v2_encoder_select="aandct" @@ -1045,7 +1043,7 @@ svq3_decoder_suggest="zlib" tiff_decoder_suggest="zlib" tiff_encoder_suggest="zlib" tscc_decoder_select="zlib" -vc1_vdpau_decoder_deps="vdpau" +vc1_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" vorbis_decoder_select="fft mdct" vorbis_encoder_select="fft mdct" wmav1_decoder_select="fft mdct" @@ -1054,7 +1052,7 @@ wmav2_decoder_select="fft mdct" wmav2_encoder_select="fft mdct" wmv1_encoder_select="aandct" wmv2_encoder_select="aandct" -wmv3_vdpau_decoder_deps="vdpau" +wmv3_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" zlib_decoder_select="zlib" zlib_encoder_select="zlib" zmbv_decoder_select="zlib" @@ -1083,7 +1081,6 @@ libtheora_encoder_deps="libtheora" libvorbis_encoder_deps="libvorbis" libx264_encoder_deps="libx264" libxvid_encoder_deps="libxvid" -vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" # demuxers / muxers ac3_demuxer_deps="ac3_parser" @@ -2311,7 +2308,6 @@ echo "libtheora enabled ${libtheora-no}" echo "libvorbis enabled ${libvorbis-no}" echo "libx264 enabled ${libx264-no}" echo "libxvid enabled ${libxvid-no}" -echo "vdpau enabled ${vdpau-no}" echo "zlib enabled ${zlib-no}" echo "bzlib enabled ${bzlib-no}" echo