opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-30 21:08:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of redundant vdpau option, decoders can still be disabled individually.

Browse Source 
Originally committed as revision 17855 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun
2009-03-06 10:18:39 +00:00
parent 49caac2413
commit 711dae776f
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -88,7 +88,6 @@ show_help(){
echo " --enable-pthreads use pthreads [no]" echo " --enable-pthreads use pthreads [no]"
echo " --enable-w32threads use Win32 threads [no]" echo " --enable-w32threads use Win32 threads [no]"
echo " --enable-x11grab enable X11 grabbing [no]" echo " --enable-x11grab enable X11 grabbing [no]"
echo " --enable-vdpau enable VDPAU support [no]"
echo " --disable-network disable network support [no]" echo " --disable-network disable network support [no]"
echo " --disable-ipv6 disable IPv6 support [no]" echo " --disable-ipv6 disable IPv6 support [no]"
echo " --disable-mpegaudio-hp faster (but less accurate) MPEG audio decoding [no]" echo " --disable-mpegaudio-hp faster (but less accurate) MPEG audio decoding [no]"
@ -803,7 +802,6 @@ CONFIG_LIST="
shared shared
small small
static static
vdpau
x11grab x11grab
zlib zlib
" "
@ -1011,7 +1009,7 @@ h261_encoder_select="aandct"
h263_encoder_select="aandct" h263_encoder_select="aandct"
h263p_encoder_select="aandct" h263p_encoder_select="aandct"
h264_decoder_select="golomb" 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" imc_decoder_select="fft mdct"
jpegls_decoder_select="golomb" jpegls_decoder_select="golomb"
jpegls_encoder_select="golomb" jpegls_encoder_select="golomb"
@ -1021,8 +1019,8 @@ mjpeg_encoder_select="aandct"
mpeg1video_encoder_select="aandct" mpeg1video_encoder_select="aandct"
mpeg2video_encoder_select="aandct" mpeg2video_encoder_select="aandct"
mpeg4_encoder_select="aandct" mpeg4_encoder_select="aandct"
mpeg_vdpau_decoder_deps="vdpau" mpeg_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
mpeg1_vdpau_decoder_deps="vdpau" mpeg1_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h" mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h"
msmpeg4v1_encoder_select="aandct" msmpeg4v1_encoder_select="aandct"
msmpeg4v2_encoder_select="aandct" msmpeg4v2_encoder_select="aandct"
@ -1045,7 +1043,7 @@ svq3_decoder_suggest="zlib"
tiff_decoder_suggest="zlib" tiff_decoder_suggest="zlib"
tiff_encoder_suggest="zlib" tiff_encoder_suggest="zlib"
tscc_decoder_select="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_decoder_select="fft mdct"
vorbis_encoder_select="fft mdct" vorbis_encoder_select="fft mdct"
wmav1_decoder_select="fft mdct" wmav1_decoder_select="fft mdct"
@ -1054,7 +1052,7 @@ wmav2_decoder_select="fft mdct"
wmav2_encoder_select="fft mdct" wmav2_encoder_select="fft mdct"
wmv1_encoder_select="aandct" wmv1_encoder_select="aandct"
wmv2_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_decoder_select="zlib"
zlib_encoder_select="zlib" zlib_encoder_select="zlib"
zmbv_decoder_select="zlib" zmbv_decoder_select="zlib"
@ -1083,7 +1081,6 @@ libtheora_encoder_deps="libtheora"
libvorbis_encoder_deps="libvorbis" libvorbis_encoder_deps="libvorbis"
libx264_encoder_deps="libx264" libx264_encoder_deps="libx264"
libxvid_encoder_deps="libxvid" libxvid_encoder_deps="libxvid"
vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
# demuxers / muxers # demuxers / muxers
ac3_demuxer_deps="ac3_parser" ac3_demuxer_deps="ac3_parser"
@ -2311,7 +2308,6 @@ echo "libtheora enabled ${libtheora-no}"
echo "libvorbis enabled ${libvorbis-no}" echo "libvorbis enabled ${libvorbis-no}"
echo "libx264 enabled ${libx264-no}" echo "libx264 enabled ${libx264-no}"
echo "libxvid enabled ${libxvid-no}" echo "libxvid enabled ${libxvid-no}"
echo "vdpau enabled ${vdpau-no}"
echo "zlib enabled ${zlib-no}" echo "zlib enabled ${zlib-no}"
echo "bzlib enabled ${bzlib-no}" echo "bzlib enabled ${bzlib-no}"
echo echo