diff options
author | rtogni <rtogni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-24 00:10:47 +0000 |
---|---|---|
committer | rtogni <rtogni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-24 00:10:47 +0000 |
commit | 46df6620253797d207a2ed09bb5a0bd3783147ce (patch) | |
tree | cdfca551b4e34e42113315d95a2361a31921ce8b /configure | |
parent | ef29ff34ff9222a55c5e4672ba2ace3b21db630c (diff) | |
download | mpv-46df6620253797d207a2ed09bb5a0bd3783147ce.tar.bz2 mpv-46df6620253797d207a2ed09bb5a0bd3783147ce.tar.xz |
Fix compilation after ffmpeg changes in r7619
Some libraries still need tweaks
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22002 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 46 |
1 files changed, 41 insertions, 5 deletions
@@ -1629,15 +1629,15 @@ _amr_nb=auto _amr_nb_fixed=auto _amr_wb=auto _libavdecoders_all=`sed -n 's/^[^#]*DEC.*, *\(.*\)).*/\1_decoder/p' "libavcodec/allcodecs.c"` -_libavdecoders=` echo $_libavdecoders_all | sed -e /mpeg_xvmc_decoder/d -e /aac_decoder/d -e /mpeg4aac_decoder/d -e /ac3_decoder/d -e /libgsm_decoder/d ` +_libavdecoders=` echo $_libavdecoders_all | sed -e s/aac_decoder// -e s/mpeg4aac_decoder// -e s/ac3_decoder// -e s/libgsm_decoder// ` _libavencoders_all=`sed -n 's/^[^#]*ENC.*, *\(.*\)).*/\1_encoder/p' "libavcodec/allcodecs.c"` -_libavencoders=$_libavencoders_all +_libavencoders=` echo $_libavencoders_all | sed -e s/libgsm_encoder// ` _libavparsers_all=`sed -n 's/^[^#]*PARSER.*, *\(.*\)).*/\1_parser/p' "libavcodec/allcodecs.c"` _libavparsers=$_libavparsers_all _libavdemuxers_all=`sed -n 's/^[^#]*DEMUX.*, *\(.*\)).*/\1_demuxer/p' libavformat/allformats.c ` -_libavdemuxers=`echo $_libavdemuxers_all | sed -e /audio_demuxer/d -e /1394_demuxer/d -e /redir_demuxer/d -e /rtsp_demuxer/d -e /sdp_demuxer/d ` +_libavdemuxers=`echo $_libavdemuxers_all | sed -e s/audio_demuxer// -e s/dc1394_demuxer// -e s/dv1394_demuxer// -e s/redir_demuxer// -e s/rtsp_demuxer// -e s/sdp_demuxer// -e s/video_grab_device_demuxer// -e s/x11_grab_device_demuxer// -e s/v4l2_demuxer// ` _libavmuxers_all=`sed -n 's/^[^#]*_MUX.*, *\(.*\)).*/\1_muxer/p' libavformat/allformats.c` -_libavmuxers=$_libavmuxers_all +_libavmuxers=`echo $_libavmuxers_all | sed -e s/audio_muxer// -e s/rtp_muxer// ` _libavcodec_so=auto _libavformat=auto _libavformat_so=auto @@ -7429,6 +7429,42 @@ done _libs_mplayer=$_ld_tmp ############################################################################# +# Take care of ffmpeg dependencies +if test "$_zlib" = no ; then + _libavdecoders=`echo $_libavdecoders | sed -e s/flashsv_decoder// -e s/png_decoder// -e s/zmbv_decoder// ` + _libavencoders=`echo $_libavencoders | sed -e s/flashsv_encoder// -e s/png_encoder// -e s/zmbv_encoder// ` +fi +if test "$_amr_nb" = no && test "$_amr_nb_fixed" = no ; then + _libavdecoders=`echo $_libavdecoders | sed -e s/amr_nb_decoder// ` + _libavencoders=`echo $_libavencoders | sed -e s/amr_nb_encoder// ` +fi +if test "$_amr_wb" = no ; then + _libavdecoders=`echo $_libavdecoders | sed -e s/amr_wb_decoder// ` + _libavencoders=`echo $_libavencoders | sed -e s/amr_wb_encoder// ` +fi +if test "$_libdts" = no ; then + _libavdecoders=`echo $_libavdecoders | sed -e s/dts_decoder// ` +fi +if test "$_xvmc" = no ; then + _libavdecoders=`echo $_libavdecoders | sed -e s/mpeg_xvmc_decoder// ` +fi +if test "$_x264" = no || test "$_lavc_x264" = no ; then + _libavencoders=`echo $_libavencoders | sed -e s/x264_encoder// ` +fi +if test "$_xvid" = no || test "$_lavc_xvid" = no ; then + _libavencoders=`echo $_libavencoders | sed -e s/xvid_encoder// ` +fi +if test "$_faac" = no || test "$_lavc_faac" = no ; then + _libavencoders=`echo $_libavencoders | sed -e s/faac_encoder// ` +fi +if test "$_mp3lame" = no || test "$_lavc_mp3lame" = no ; then + _libavencoders=`echo $_libavencoders | sed -e s/mp3lame_encoder// ` +fi +if test "$_nut" = no ; then + _libavmuxers=`echo $_libavmuxers | sed -e s/nut_muxer// ` +fi + +############################################################################# echo "Creating config.mak" cat > config.mak << EOF # -------- Generated by configure ----------- @@ -7588,7 +7624,7 @@ CONFIG_AMR_WB=$_amr_wb `echo $_libavdemuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` `echo $_libavmuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` CONFIG_FAAC=$_lavc_faac -CONFIG_MP3LAME=$_lavc_mp3lame +CONFIG_LIBMP3LAME=$_lavc_mp3lame CONFIG_XVID=$_lavc_xvid CONFIG_X264=$_lavc_x264 CONFIG_ZLIB=$_zlib |