Vorbis decoder by (Balatoni Denes | dbalatoni programozo hu)

Originally committed as revision 4261 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/Makefile

@@ -151,6 +151,9 @@ endif
 ifneq ($(CONFIG_VMDVIDEO_DECODER)$(CONFIG_VMDAUDIO_DECODER),)
     OBJS+= vmdav.o
 endif
+ifeq ($(CONFIG_VORBIS_DECODER),yes)
+    OBJS+= vorbis.o
+endif
 ifneq ($(CONFIG_VP3_DECODER)$(CONFIG_THEORA_DECODER),)
     OBJS+= vp3.o
 endif

libavcodec/allcodecs.c

@@ -55,7 +55,7 @@ void avcodec_register_all(void)
 #ifdef CONFIG_OGGVORBIS_ENCODER
     register_avcodec(&oggvorbis_encoder);
 #endif //CONFIG_OGGVORBIS_ENCODER
-#ifdef CONFIG_OGGVORBIS_DECODER
+#if (defined CONFIG_OGGVORBIS_DECODER && !defined CONFIG_VORBIS_DECODER)
     register_avcodec(&oggvorbis_decoder);
 #endif //CONFIG_OGGVORBIS_DECODER
 #endif
@@ -476,6 +476,9 @@ void avcodec_register_all(void)
 #ifdef CONFIG_WS_SND1_DECODER
     register_avcodec(&ws_snd1_decoder);
 #endif //CONFIG_WS_SND1_DECODER
+#ifdef CONFIG_VORBIS_DECODER
+    register_avcodec(&vorbis_decoder);
+#endif
 #endif /* CONFIG_DECODERS */
 
 #ifdef AMR_NB

libavcodec/avcodec.h

@@ -2018,6 +2018,7 @@ extern AVCodec aasc_decoder;
 extern AVCodec alac_decoder;
 extern AVCodec ws_snd1_decoder;
 extern AVCodec indeo2_decoder;
+extern AVCodec vorbis_decoder;
 
 /* pcm codecs */
 #define PCM_CODEC(id, name) \