aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/allcodecs.c
diff options
context:
space:
mode:
authorOded Shimon <ods15@ods15.dyndns.org>2006-10-02 06:18:02 +0000
committerOded Shimon <ods15@ods15.dyndns.org>2006-10-02 06:18:02 +0000
commit8c37516af0631d748d0b10bf04dd673529892810 (patch)
tree4bb8299466f3f996d62f1e8833ad9a1e0ed43891 /libavcodec/allcodecs.c
parent007574482a79bf980de963a3fbff90adac86f4b9 (diff)
downloadffmpeg-8c37516af0631d748d0b10bf04dd673529892810.tar.gz
Add vorbis encoder to ffmpeg
Originally committed as revision 6519 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/allcodecs.c')
-rw-r--r--libavcodec/allcodecs.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index bf8b052930..fdd80fc07c 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -51,7 +51,7 @@ void avcodec_register_all(void)
#endif //CONFIG_MP3LAME_ENCODER
#endif
#ifdef CONFIG_LIBVORBIS
-#ifdef CONFIG_OGGVORBIS_ENCODER
+#if (defined CONFIG_OGGVORBIS_ENCODER && !defined CONFIG_VORBIS_ENCODER)
register_avcodec(&oggvorbis_encoder);
#endif //CONFIG_OGGVORBIS_ENCODER
#if (defined CONFIG_OGGVORBIS_DECODER && !defined CONFIG_VORBIS_DECODER)
@@ -507,6 +507,9 @@ void avcodec_register_all(void)
#ifdef CONFIG_VORBIS_DECODER
register_avcodec(&vorbis_decoder);
#endif
+#ifdef CONFIG_VORBIS_ENCODER
+ register_avcodec(&vorbis_encoder);
+#endif
#ifdef CONFIG_LIBGSM
register_avcodec(&libgsm_decoder);
#endif //CONFIG_LIBGSM