summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorJuanjo <pulento@users.sourceforge.net>2002-03-10 14:58:53 +0000
committerJuanjo <pulento@users.sourceforge.net>2002-03-10 14:58:53 +0000
commit9d36bdc9beb7b910b9166c40a2d3e76373d0f7cf (patch)
tree686e051faa8eaa77bcf908de5ba24f5625df9d34 /libavcodec
parent0716b577b622fcb6f99da0035c0a3dc898d28311 (diff)
- Added MP3 encoding through libmp3lame contributed by Lennert Buytenhek.
Originally committed as revision 326 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/avcodec.h2
-rw-r--r--libavcodec/utils.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index d8abfded9b..cc16cc876f 100644
--- 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 0e6ba29d7a..2d7b6a9070 100644
--- 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);