Mercurial > libavformat.hg

changeset 1622:ac2a299df031 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
variable renaming: mp3lame --> libmp3lame
author diego
date Sun, 07 Jan 2007 00:02:15 +0000
parents 2f3091d284f8
children bdb50e314f29
files asf-enc.c flvenc.c mp3.c nut.c
diffstat 4 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/asf-enc.c	Sat Jan 06 23:54:01 2007 +0000
+++ b/asf-enc.c	Sun Jan 07 00:02:15 2007 +0000
@@ -832,7 +832,7 @@
     "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 @@
     "video/x-ms-asf",
     "asf,wmv,wma",
     sizeof(ASFContext),
-#ifdef CONFIG_MP3LAME
+#ifdef CONFIG_LIBMP3LAME
     CODEC_ID_MP3,
 #else
     CODEC_ID_MP2,
--- a/flvenc.c	Sat Jan 06 23:54:01 2007 +0000
+++ b/flvenc.c	Sun Jan 07 00:02:15 2007 +0000
@@ -323,11 +323,11 @@
     "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,
--- a/mp3.c	Sat Jan 06 23:54:01 2007 +0000
+++ b/mp3.c	Sun Jan 07 00:02:15 2007 +0000
@@ -401,7 +401,7 @@
     "mp2",
     "MPEG audio layer 2",
     "audio/x-mpeg",
-#ifdef CONFIG_MP3LAME
+#ifdef CONFIG_LIBMP3LAME
     "mp2,m2a",
 #else
     "mp2,mp3,m2a",
--- a/nut.c	Sat Jan 06 23:54:01 2007 +0000
+++ b/nut.c	Sun Jan 07 00:02:15 2007 +0000
@@ -1443,7 +1443,7 @@
     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 */