diff options
| author | Oded Shimon <ods15@ods15.dyndns.org> | 2006-10-02 06:18:02 +0000 |
|---|---|---|
| committer | Oded Shimon <ods15@ods15.dyndns.org> | 2006-10-02 06:18:02 +0000 |
| commit | 8c37516af0631d748d0b10bf04dd673529892810 (patch) | |
| tree | 4bb8299466f3f996d62f1e8833ad9a1e0ed43891 | |
| parent | 007574482a79bf980de963a3fbff90adac86f4b9 (diff) | |
Add vorbis encoder to ffmpeg
Originally committed as revision 6519 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/Makefile | 1 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 5 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 907cb766d6..2d6f57ab23 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -122,6 +122,7 @@ OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdav.o 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 --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 diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 766a63ba19..a3e80ca8b3 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2162,6 +2162,7 @@ extern AVCodec asv2_encoder; 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; |