Mercurial > mplayer.hg

comparison configure @ 32217:e9e3137f8b43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make sure that CONFIG_LIBMP3LAME is always #defined.
author diego
date Sat, 18 Sep 2010 10:46:47 +0000
parents e3942e3b3920
children b897901c0b0a
comparison
equal deleted inserted replaced
32216:e3942e3b3920 32217:e9e3137f8b43
7354 7354
7355 # mencoder requires (optional) those libs: libmp3lame 7355 # mencoder requires (optional) those libs: libmp3lame
7356 if test "$_mencoder" != no ; then 7356 if test "$_mencoder" != no ; then
7357 7357
7358 echocheck "libmp3lame" 7358 echocheck "libmp3lame"
7359 def_mp3lame='#undef CONFIG_MP3LAME'
7360 def_mp3lame_lavc="#define CONFIG_LIBMP3LAME 0"
7359 def_mp3lame_preset='#undef CONFIG_MP3LAME_PRESET' 7361 def_mp3lame_preset='#undef CONFIG_MP3LAME_PRESET'
7360 def_mp3lame_preset_medium='#undef CONFIG_MP3LAME_PRESET_MEDIUM' 7362 def_mp3lame_preset_medium='#undef CONFIG_MP3LAME_PRESET_MEDIUM'
7361 if test "$_mp3lame" = auto ; then 7363 if test "$_mp3lame" = auto ; then
7362 _mp3lame=no 7364 _mp3lame=no
7363 cat > $TMPC <<EOF 7365 cat > $TMPC <<EOF
7383 libavencoders="$libavencoders LIBMP3LAME_ENCODER" 7385 libavencoders="$libavencoders LIBMP3LAME_ENCODER"
7384 libs_mplayer="$libs_mplayer $_ld_mp3lame" 7386 libs_mplayer="$libs_mplayer $_ld_mp3lame"
7385 fi 7387 fi
7386 else 7388 else
7387 _mp3lame_lavc=no 7389 _mp3lame_lavc=no
7388 def_mp3lame='#undef CONFIG_MP3LAME'
7389 def_mp3lame_lavc="#define CONFIG_LIBMP3LAME 0"
7390 fi 7390 fi
7391 res_comment="in FFmpeg: $_mp3lame_lavc" 7391 res_comment="in FFmpeg: $_mp3lame_lavc"
7392 echores "$_mp3lame" 7392 echores "$_mp3lame"
7393 7393
7394 fi # test "$_mencoder" != no 7394 fi # test "$_mencoder" != no