[MPlayer-cvslog] r22004 - trunk/configure
rtogni
subversion at mplayerhq.hu
Wed Jan 24 11:31:52 CET 2007
Author: rtogni
Date: Wed Jan 24 11:31:51 2007
New Revision: 22004
Modified:
trunk/configure
Log:
Fix compilation if no libogg/libvoribs installed
Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Wed Jan 24 11:31:51 2007
@@ -1629,7 +1629,7 @@
_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 s/aac_decoder// -e s/mpeg4aac_decoder// -e s/ac3_decoder// -e s/libgsm_decoder// `
+_libavdecoders=` echo $_libavdecoders_all | sed -e s/aac_decoder// -e s/mpeg4aac_decoder// -e s/ac3_decoder// -e s/libgsm_decoder// -e s/libvorbis_decoder// `
_libavencoders_all=`sed -n 's/^[^#]*ENC.*, *\(.*\)).*/\1_encoder/p' "libavcodec/allcodecs.c"`
_libavencoders=` echo $_libavencoders_all | sed -e s/libgsm_encoder// `
_libavparsers_all=`sed -n 's/^[^#]*PARSER.*, *\(.*\)).*/\1_parser/p' "libavcodec/allcodecs.c"`
@@ -7460,6 +7460,10 @@
if test "$_mp3lame" = no || test "$_lavc_mp3lame" = no ; then
_libavencoders=`echo $_libavencoders | sed -e s/mp3lame_encoder// `
fi
+if test "$_libvorbis" = no ; then
+ _libavencoders=`echo $_libavencoders | sed -e s/libvorbis_encoder// `
+ _libavmuxers=`echo $_libavmuxers | sed -e s/ogg_muxer// `
+fi
if test "$_nut" = no ; then
_libavmuxers=`echo $_libavmuxers | sed -e s/nut_muxer// `
fi
More information about the MPlayer-cvslog
mailing list