summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-24 23:32:39 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-24 23:32:39 +0000
commitc64125cf0bd46b4a34cfded1a650065d1bf54de1 (patch)
treef5a6a008b622b057e0c22c34ae4553896452169e
parent15ea8dba89b5790f2a2ccda335aabc92dd9af101 (diff)
downloadmpv-c64125cf0bd46b4a34cfded1a650065d1bf54de1.tar.bz2
mpv-c64125cf0bd46b4a34cfded1a650065d1bf54de1.tar.xz
Rename CONFIG_MP3LAME variable, the variable for LAME support in FFmpeg
had the same name. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21196 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure2
-rw-r--r--libmpcodecs/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index eb31bbe0f1..aeecc46b68 100755
--- a/configure
+++ b/configure
@@ -7339,7 +7339,7 @@ DVBIN = $_dvbin
VIDIX = $_vidix_internal
EXTERNAL_VIDIX = $_vidix_external
CONFIG_PP = yes
-CONFIG_MP3LAME = $_mp3lame
+MP3LAME = $_mp3lame
LIBMENU = $_menu
MP3LIB = $_mp3lib
diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index d91cefd95a..fb903644fa 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -263,7 +263,7 @@ ifeq ($(TWOLAME),yes)
ENCODER_SRCS += ae_twolame.c
endif
-ifeq ($(CONFIG_MP3LAME),yes)
+ifeq ($(MP3LAME),yes)
ENCODER_SRCS += ae_lame.c
endif