Add vorbis encoder to ffmpeg

Originally committed as revision 6519 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Oded Shimon 18 years ago
parent 007574482a
commit 8c37516af0
  1. 1
      libavcodec/Makefile
  2. 5
      libavcodec/allcodecs.c
  3. 1
      libavcodec/avcodec.h

@ -122,6 +122,7 @@ OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdav.o
OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdav.o OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdav.o
OBJS-$(CONFIG_VMNC_DECODER) += vmnc.o OBJS-$(CONFIG_VMNC_DECODER) += vmnc.o
OBJS-$(CONFIG_VORBIS_DECODER) += vorbis.o vorbis_data.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_VP3_DECODER) += vp3.o
OBJS-$(CONFIG_VP5_DECODER) += vp5.o vp56.o vp56data.o OBJS-$(CONFIG_VP5_DECODER) += vp5.o vp56.o vp56data.o
OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o

@ -51,7 +51,7 @@ void avcodec_register_all(void)
#endif //CONFIG_MP3LAME_ENCODER #endif //CONFIG_MP3LAME_ENCODER
#endif #endif
#ifdef CONFIG_LIBVORBIS #ifdef CONFIG_LIBVORBIS
#ifdef CONFIG_OGGVORBIS_ENCODER #if (defined CONFIG_OGGVORBIS_ENCODER && !defined CONFIG_VORBIS_ENCODER)
register_avcodec(&oggvorbis_encoder); register_avcodec(&oggvorbis_encoder);
#endif //CONFIG_OGGVORBIS_ENCODER #endif //CONFIG_OGGVORBIS_ENCODER
#if (defined CONFIG_OGGVORBIS_DECODER && !defined CONFIG_VORBIS_DECODER) #if (defined CONFIG_OGGVORBIS_DECODER && !defined CONFIG_VORBIS_DECODER)
@ -507,6 +507,9 @@ void avcodec_register_all(void)
#ifdef CONFIG_VORBIS_DECODER #ifdef CONFIG_VORBIS_DECODER
register_avcodec(&vorbis_decoder); register_avcodec(&vorbis_decoder);
#endif #endif
#ifdef CONFIG_VORBIS_ENCODER
register_avcodec(&vorbis_encoder);
#endif
#ifdef CONFIG_LIBGSM #ifdef CONFIG_LIBGSM
register_avcodec(&libgsm_decoder); register_avcodec(&libgsm_decoder);
#endif //CONFIG_LIBGSM #endif //CONFIG_LIBGSM

@ -2162,6 +2162,7 @@ extern AVCodec asv2_encoder;
extern AVCodec vcr1_encoder; extern AVCodec vcr1_encoder;
extern AVCodec ffv1_encoder; extern AVCodec ffv1_encoder;
extern AVCodec snow_encoder; extern AVCodec snow_encoder;
extern AVCodec vorbis_encoder;
extern AVCodec mdec_encoder; extern AVCodec mdec_encoder;
extern AVCodec zlib_encoder; extern AVCodec zlib_encoder;
extern AVCodec sonic_encoder; extern AVCodec sonic_encoder;

Loading…
Cancel
Save