# HG changeset patch
# User ods15
# Date 1159769882 0
# Node ID ac5df84bc14c7772b0b4ce994b8ff75b30e6c513
# Parent  f2204277a928e1f593ecded9e6f721b32784ae15
Add vorbis encoder to ffmpeg

diff -r f2204277a928 -r ac5df84bc14c Makefile
--- a/Makefile	Mon Oct 02 06:09:52 2006 +0000
+++ b/Makefile	Mon Oct 02 06:18:02 2006 +0000
@@ -122,6 +122,7 @@
 OBJS-$(CONFIG_VMDVIDEO_DECODER)        += vmdav.o
 OBJS-$(CONFIG_VMNC_DECODER)            += vmnc.o
 OBJS-$(CONFIG_VORBIS_DECODER)          += vorbis.o vorbis_data.o
+OBJS-$(CONFIG_VORBIS_ENCODER)          += vorbis_enc.o vorbis_data.o
 OBJS-$(CONFIG_VP3_DECODER)             += vp3.o
 OBJS-$(CONFIG_VP5_DECODER)             += vp5.o vp56.o vp56data.o
 OBJS-$(CONFIG_VP6_DECODER)             += vp6.o vp56.o vp56data.o
diff -r f2204277a928 -r ac5df84bc14c allcodecs.c
--- a/allcodecs.c	Mon Oct 02 06:09:52 2006 +0000
+++ b/allcodecs.c	Mon Oct 02 06:18:02 2006 +0000
@@ -51,7 +51,7 @@
 #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 @@
 #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
diff -r f2204277a928 -r ac5df84bc14c avcodec.h
--- a/avcodec.h	Mon Oct 02 06:09:52 2006 +0000
+++ b/avcodec.h	Mon Oct 02 06:18:02 2006 +0000
@@ -2162,6 +2162,7 @@
 extern AVCodec vcr1_encoder;
 extern AVCodec ffv1_encoder;
 extern AVCodec snow_encoder;
+extern AVCodec vorbis_encoder;
 extern AVCodec mdec_encoder;
 extern AVCodec zlib_encoder;
 extern AVCodec sonic_encoder;