mirror of https://github.com/mpv-player/mpv
Disable linking mplayer with mp3lame when --disable-encoder=mp3lame is
passed to configure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20114 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
9369a84ebe
commit
f0996fb64c
7
Makefile
7
Makefile
|
@ -99,7 +99,6 @@ CODEC_LIBS = $(AV_LIB) \
|
|||
$(THEORA_LIB) \
|
||||
$(FAAD_LIB) \
|
||||
$(LIBLZO_LIB) \
|
||||
$(DECORE_LIB) \
|
||||
$(XVID_LIB) \
|
||||
$(DTS_LIB) \
|
||||
$(PNG_LIB) \
|
||||
|
@ -112,6 +111,10 @@ CODEC_LIBS = $(AV_LIB) \
|
|||
$(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 @@ $(PRG): $(MPLAYER_DEP)
|
|||
|
||||
ifeq ($(MENCODER),yes)
|
||||
LIBS_MENCODER = libmpcodecs/libmpencoders.a \
|
||||
$(ENCORE_LIB) \
|
||||
$(MP3LAME_LIB) \
|
||||
$(COMMON_LIBS) \
|
||||
|
||||
$(PRG_MENCODER): $(MENCODER_DEP)
|
||||
|
|
|
@ -6636,6 +6636,7 @@ EOF
|
|||
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 @@ LIBNUT = $_nut
|
|||
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
|
||||
|
|
Loading…
Reference in New Issue