diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-01-07 00:02:15 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-01-07 00:02:15 +0000 |
| commit | 6ebe07fbb55e78ed72781deb2fe263ab86135f30 (patch) | |
| tree | 7df321f4a3b61519e1f9a03c72c7bc7398baff5f /libavformat | |
| parent | 2eed5a461fa163b8b7ee86b9d86f46f188c101c5 (diff) | |
| download | ffmpeg-6ebe07fbb55e78ed72781deb2fe263ab86135f30.tar.gz | |
variable renaming: mp3lame --> libmp3lame
Originally committed as revision 7417 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/asf-enc.c | 4 | ||||
| -rw-r--r-- | libavformat/flvenc.c | 6 | ||||
| -rw-r--r-- | libavformat/mp3.c | 2 | ||||
| -rw-r--r-- | libavformat/nut.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/asf-enc.c b/libavformat/asf-enc.c index b6162b7dda..f72fef97a1 100644 --- 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 d87b6f39c4..ef618db42e 100644 --- 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 723980c839..02b50cff2c 100644 --- 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 df64caf159..995149951d 100644 --- 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 */ |