Mercurial > mplayer.hg
changeset 32356:961e2cbf7a54
Require LAME 3.98.3 for MPlayer, same as is required for FFmpeg.
| author | diego |
|---|---|
| date | Tue, 05 Oct 2010 10:08:53 +0000 |
| parents | fe4d1e6b171b |
| children | 379ac243ea60 |
| files | DOCS/xml/en/install.xml configure |
| diffstat | 2 files changed, 4 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/DOCS/xml/en/install.xml Tue Oct 05 09:49:17 2010 +0000 +++ b/DOCS/xml/en/install.xml Tue Oct 05 10:08:53 2010 +0000 @@ -70,8 +70,8 @@ required for the directfb/dfbmga video output drivers </para></listitem> <listitem><para> - <emphasis role="bold">lame</emphasis> - 3.90 or later is recommended, - necessary for encoding MP3 audio with <application>MEncoder</application>. + <emphasis role="bold">lame</emphasis> - 3.98.3 or later, + necessary for encoding MP3 audio with <application>MEncoder</application> </para></listitem> <listitem><para> <emphasis role="bold">zlib</emphasis> - recommended, many codecs use it.
--- a/configure Tue Oct 05 09:49:17 2010 +0000 +++ b/configure Tue Oct 05 10:08:53 2010 +0000 @@ -7245,13 +7245,8 @@ def_mp3lame_preset_medium='#undef CONFIG_MP3LAME_PRESET_MEDIUM' if test "$_mp3lame" = auto ; then _mp3lame=no - cat > $TMPC <<EOF -#include <lame/lame.h> -int main(void) { lame_version_t lv; lame_init(); - get_lame_version_numerical(&lv); - return 0; } -EOF - cc_check -lmp3lame $_ld_lm && _mp3lame=yes + statement_check lame/lame.h 'hip_decode_init()' -lmp3lame $_ld_lm && + _mp3lame=yes && _mp3lame_lavc=yes fi if test "$_mp3lame" = yes ; then def_mp3lame="#define CONFIG_MP3LAME 1" @@ -7259,10 +7254,6 @@ libs_mencoder="$libs_mencoder $_ld_mp3lame" statement_check lame/lame.h 'lame_set_preset(NULL, STANDARD_FAST)' $_ld_mp3lame $_ld_lm && def_mp3lame_preset="#define CONFIG_MP3LAME_PRESET 1" statement_check lame/lame.h 'lame_set_preset(NULL, MEDIUM_FAST)' $_ld_mp3lame $_ld_lm && def_mp3lame_preset_medium="#define CONFIG_MP3LAME_PRESET_MEDIUM 1" - if test "$_mp3lame_lavc" = auto; then - _mp3lame_lavc=no - statement_check lame/lame.h 'hip_decode_init()' -lmp3lame $_ld_lm && _mp3lame_lavc=yes - fi if test "$_mp3lame_lavc" = yes ; then def_mp3lame_lavc="#define CONFIG_LIBMP3LAME 1" libavencoders="$libavencoders LIBMP3LAME_ENCODER"