variable renaming: mp3lame --> libmp3lame

Originally committed as revision 7417 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 92dd7e4..ec16512 100755 (executable)
--- a/configure
+++ b/configure
@@ -430,11 +430,11 @@ CONFIG_LIST='
     libfaad
     libfaadbin
     libgsm
+    libmp3lame
     libnut
     libogg
     libvorbis
     memalign_hack
-    mp3lame
     mpegaudio_hp
     network
     pp
@@ -596,8 +596,8 @@ libfaac="no"
 libfaad="no"
 libfaadbin="no"
 libgsm="no"
-mp3lame="no"
 libdts="no"
+libmp3lame="no"
 libnut="no"
 libogg="no"
 libvorbis="no"
@@ -944,7 +944,7 @@ for opt do
   ;;
   --enable-libgsm) libgsm="yes"
   ;;
-  --enable-mp3lame) mp3lame="yes"
+  --enable-mp3lame) libmp3lame="yes"
   ;;
   --enable-libnut) libnut="yes"
   ;;
@@ -1465,7 +1465,7 @@ fi
 # these are off by default, so fail if requested and not available
 enabled libdts  && require libdts dts.h dts_init -ldts -lm
 enabled libgsm  && require libgsm gsm.h gsm_create -lgsm
-enabled mp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm
+enabled libmp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm
 enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbis -lvorbisenc -logg
 enabled libogg  && require libogg ogg/ogg.h ogg_sync_init -logg
 enabled libnut  && require libnut libnut.h nut_demuxer_init -lnut
@@ -1799,7 +1799,7 @@ echo "libfaac enabled           $libfaac"
 echo "libfaad enabled           $libfaad"
 echo "faadbin enabled           $libfaadbin"
 echo "libgsm enabled            $libgsm"
-echo "libmp3lame enabled        $mp3lame"
+echo "libmp3lame enabled        $libmp3lame"
 echo "libnut enabled            $libnut"
 echo "libogg enabled            $libogg"
 echo "libvorbis enabled         $libvorbis"

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 9bf27d3..c2f330e 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -247,7 +247,7 @@ OBJS-$(CONFIG_LIBFAAD)                 += faad.o
 OBJS-$(CONFIG_LIBFAAC)                 += faac.o
 OBJS-$(CONFIG_XVID)                    += xvidff.o xvid_rc.o
 OBJS-$(CONFIG_X264)                    += x264.o
-OBJS-$(CONFIG_MP3LAME)                 += mp3lameaudio.o
+OBJS-$(CONFIG_LIBMP3LAME)              += mp3lameaudio.o
 OBJS-$(CONFIG_LIBVORBIS)               += oggvorbis.o
 OBJS-$(CONFIG_LIBGSM)                  += libgsm.o
 

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index ce9df7f..92c3ce6 100644 (file)
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -193,7 +193,7 @@ void avcodec_register_all(void)
     REGISTER_ENCDEC (MP2, mp2);
     REGISTER_DECODER(MP3, mp3);
     REGISTER_DECODER(MP3ADU, mp3adu);
-#ifdef CONFIG_MP3LAME
+#ifdef CONFIG_LIBMP3LAME
     REGISTER_ENCODER(MP3LAME, mp3lame);
 #endif
     REGISTER_DECODER(MP3ON4, mp3on4);

diff --git a/libavformat/asf-enc.c b/libavformat/asf-enc.c
index b6162b7..f72fef9 100644 (file)
--- a/libavformat/asf-enc.c
+++ b/libavformat/asf-enc.c
@@ -832,7 +832,7 @@ AVOutputFormat asf_muxer = {
     "video/x-ms-asf",
     "asf,wmv,wma",
     sizeof(ASFContext),
-#ifdef CONFIG_MP3LAME
+#ifdef CONFIG_LIBMP3LAME
     CODEC_ID_MP3,
 #else
     CODEC_ID_MP2,
@@ -852,7 +852,7 @@ AVOutputFormat asf_stream_muxer = {
     "video/x-ms-asf",
     "asf,wmv,wma",
     sizeof(ASFContext),
-#ifdef CONFIG_MP3LAME
+#ifdef CONFIG_LIBMP3LAME
     CODEC_ID_MP3,
 #else
     CODEC_ID_MP2,

diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index d87b6f3..ef618db 100644 (file)
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -323,11 +323,11 @@ AVOutputFormat flv_muxer = {
     "video/x-flv",
     "flv",
     sizeof(FLVContext),
-#ifdef CONFIG_MP3LAME
+#ifdef CONFIG_LIBMP3LAME
     CODEC_ID_MP3,
-#else // CONFIG_MP3LAME
+#else // CONFIG_LIBMP3LAME
     CODEC_ID_NONE,
-#endif // CONFIG_MP3LAME
+#endif // CONFIG_LIBMP3LAME
     CODEC_ID_FLV1,
     flv_write_header,
     flv_write_packet,

diff --git a/libavformat/mp3.c b/libavformat/mp3.c
index 723980c..02b50cf 100644 (file)
--- a/libavformat/mp3.c
+++ b/libavformat/mp3.c
@@ -401,7 +401,7 @@ AVOutputFormat mp2_muxer = {
     "mp2",
     "MPEG audio layer 2",
     "audio/x-mpeg",
-#ifdef CONFIG_MP3LAME
+#ifdef CONFIG_LIBMP3LAME
     "mp2,m2a",
 #else
     "mp2,mp3,m2a",

diff --git a/libavformat/nut.c b/libavformat/nut.c
index df64caf..9951499 100644 (file)
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -1443,7 +1443,7 @@ AVOutputFormat nut_muxer = {
     sizeof(NUTContext),
 #ifdef CONFIG_LIBVORBIS
     CODEC_ID_VORBIS,
-#elif defined(CONFIG_MP3LAME)
+#elif defined(CONFIG_LIBMP3LAME)
     CODEC_ID_MP3,
 #else
     CODEC_ID_MP2, /* AC3 needs liba52 decoder */