Mercurial > mplayer.hg
changeset 20108:8833560dba2f
Disable linking mplayer with mp3lame when --disable-encoder=mp3lame is
passed to configure.
| author | rathann |
|---|---|
| date | Sun, 08 Oct 2006 14:10:43 +0000 |
| parents | 9c0f8660cb3d |
| children | c3133ab04741 |
| files | Makefile configure |
| diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sun Oct 08 13:49:16 2006 +0000 +++ b/Makefile Sun Oct 08 14:10:43 2006 +0000 @@ -99,7 +99,6 @@ $(THEORA_LIB) \ $(FAAD_LIB) \ $(LIBLZO_LIB) \ - $(DECORE_LIB) \ $(XVID_LIB) \ $(DTS_LIB) \ $(PNG_LIB) \ @@ -112,6 +111,10 @@ $(SPEEX_LIB) \ $(NUT_LIB) \ +ifeq ($(LAVC_MP3LAME),yes) +CODEC_LIBS += $(MP3LAME_LIB) +endif + ifeq ($(TOOLAME),yes) CODEC_LIBS += $(TOOLAME_LIB) endif @@ -388,7 +391,7 @@ ifeq ($(MENCODER),yes) LIBS_MENCODER = libmpcodecs/libmpencoders.a \ - $(ENCORE_LIB) \ + $(MP3LAME_LIB) \ $(COMMON_LIBS) \ $(PRG_MENCODER): $(MENCODER_DEP)
--- a/configure Sun Oct 08 13:49:16 2006 +0000 +++ b/configure Sun Oct 08 14:10:43 2006 +0000 @@ -6636,6 +6636,7 @@ int main(void) { int p = MEDIUM_FAST; return 0; } EOF cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset_medium="#define HAVE_MP3LAME_PRESET_MEDIUM" + echo $_libavencoders | grep -q mp3lame && _lavc_mp3lame=yes || _lavc_mp3lame=no else _def_mp3lame='#undef HAVE_MP3LAME' fi @@ -7571,9 +7572,9 @@ NUT_LIB = $_ld_nut CONFIG_DTS = $_libdts DTS_LIB = $_ld_libdts -DECORE_LIB = $_ld_mp3lame MENCODER = $_mencoder -ENCORE_LIB = $_ld_mp3lame +MP3LAME_LIB = $_ld_mp3lame +LAVC_MP3LAME = $_lavc_mp3lame DIRECTFB_LIB = $_ld_directfb CDDA = $_cdda CDPARANOIA_LIB = $_ld_cdparanoia