summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-09 23:14:33 +0000
committerrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-09 23:14:33 +0000
commit866ba3f296d465949544c2d2a5740bc56b7992cf (patch)
tree891762e0649f89fe53fa6222a39a0615f40ff5c7 /Makefile
parentd7e32a0e84b3533aa71f72c4311852fe349fc6c9 (diff)
downloadmpv-866ba3f296d465949544c2d2a5740bc56b7992cf.tar.bz2
mpv-866ba3f296d465949544c2d2a5740bc56b7992cf.tar.xz
Disable linking mplayer (and internal static libavcodec) with
libmp3lame/faac/x264 if --disable-encoder=mp3lame/faac/x264 options are passed to configure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20827 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 737e1d31ca..24141111eb 100644
--- a/Makefile
+++ b/Makefile
@@ -310,7 +310,7 @@ mplayer$(EXESUF): $(MPLAYER_DEP)
ifeq ($(MENCODER),yes)
LIBS_MENCODER = libmpcodecs/libmpencoders.a \
- $(MP3LAME_LIB) \
+ $(EXTRA_LIB_MENCODER) \
$(COMMON_LIBS) \
mencoder$(EXESUF): $(MENCODER_DEP)