- Added MP3 encoding through libmp3lame contributed by Lennert Buytenhek.

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

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index d8abfded9bea643b83314e9902b90ebf7f5b5bbd..cc16cc876fc82de730a7bc5f0a4da6734a80f802 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -9,6 +9,7 @@ enum CodecID {
     CODEC_ID_H263,
     CODEC_ID_RV10,
     CODEC_ID_MP2,
+    CODEC_ID_MP3LAME,
     CODEC_ID_AC3,
     CODEC_ID_MJPEG,
     CODEC_ID_MPEG4,
@@ -160,6 +161,7 @@ typedef struct AVPicture {
 
 extern AVCodec ac3_encoder;
 extern AVCodec mp2_encoder;
+extern AVCodec mp3lame_encoder;
 extern AVCodec mpeg1video_encoder;
 extern AVCodec h263_encoder;
 extern AVCodec h263p_encoder;

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 0e6ba29d7a769354970e46d60b56267c1740cb21..2d7b6a907058dbcdd083a8621bfc835ab2ef57a9 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -394,6 +394,9 @@ void avcodec_register_all(void)
 #ifdef CONFIG_ENCODERS
     register_avcodec(&ac3_encoder);
     register_avcodec(&mp2_encoder);
+#ifdef CONFIG_MP3LAME
+    register_avcodec(&mp3lame_encoder);
+#endif
     register_avcodec(&mpeg1video_encoder);
     register_avcodec(&h263_encoder);
     register_avcodec(&h263p_encoder);