summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2007-01-07 00:02:15 +0000
committerDiego Biurrun <diego@biurrun.de>2007-01-07 00:02:15 +0000
commit6ebe07fbb55e78ed72781deb2fe263ab86135f30 (patch)
tree7df321f4a3b61519e1f9a03c72c7bc7398baff5f /libavcodec
parent2eed5a461fa163b8b7ee86b9d86f46f188c101c5 (diff)
variable renaming: mp3lame --> libmp3lame
Originally committed as revision 7417 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/Makefile2
-rw-r--r--libavcodec/allcodecs.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 9bf27d3787..c2f330eef1 100644
--- 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 ce9df7f3b9..92c3ce6396 100644
--- 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);