# HG changeset patch
# User michael
# Date 1109258282 0
# Node ID 047f7bad4cbbcaac7559db8e305dbf0071b0d852
# Parent  b34f2cac6a717325e7bc3f7575bc6097b90c499f
01-makefile_fix_updated.patch
   Adds --enable-theora/--enable-vorbis/--enable-ogg to configure
   If compiled WITHOUT --enable-theora, native VP3 decoder is used
patch by (Nilesh Bansal <nileshbansal gmail com>)

diff -r b34f2cac6a71 -r 047f7bad4cbb Makefile
--- a/Makefile	Thu Feb 24 09:27:46 2005 +0000
+++ b/Makefile	Thu Feb 24 15:18:02 2005 +0000
@@ -118,10 +118,17 @@
 EXTRALIBS += -lmp3lame
 endif
 
-ifeq ($(CONFIG_VORBIS),yes)
+ifeq ($(CONFIG_LIBOGG),yes)
+EXTRALIBS += -logg
+ifeq ($(CONFIG_LIBVORBIS),yes)
 OBJS += oggvorbis.o
 EXTRALIBS += -lvorbis -lvorbisenc
 endif
+ifeq ($(CONFIG_LIBTHEORA), yes)
+OBJS += oggtheora.o
+EXTRALIBS += -ltheora
+endif
+endif
 
 ifeq ($(TARGET_GPROF),yes)
 CFLAGS+=-p
diff -r b34f2cac6a71 -r 047f7bad4cbb allcodecs.c
--- a/allcodecs.c	Thu Feb 24 09:27:46 2005 +0000
+++ b/allcodecs.c	Thu Feb 24 15:18:02 2005 +0000
@@ -45,10 +45,14 @@
 #ifdef CONFIG_MP3LAME
     register_avcodec(&mp3lame_encoder);
 #endif
-#ifdef CONFIG_VORBIS
+#ifdef CONFIG_LIBVORBIS
     register_avcodec(&oggvorbis_encoder);
     register_avcodec(&oggvorbis_decoder);
 #endif
+#ifdef CONFIG_LIBTHEORA
+    register_avcodec(&oggtheora_encoder);
+    register_avcodec(&oggtheora_decoder);
+#endif
 #ifdef CONFIG_FAAC
     register_avcodec(&faac_encoder);
 #endif
diff -r b34f2cac6a71 -r 047f7bad4cbb avcodec.h
--- a/avcodec.h	Thu Feb 24 09:27:46 2005 +0000
+++ b/avcodec.h	Thu Feb 24 15:18:02 2005 +0000
@@ -165,6 +165,8 @@
     CODEC_ID_MP3ADU,
     CODEC_ID_MP3ON4,
     
+    CODEC_ID_OGGTHEORA= 0x16000, 
+    
     CODEC_ID_MPEG2TS= 0x20000, /* _FAKE_ codec to indicate a raw MPEG2 transport
                          stream (only used by libavformat) */
 };
@@ -1877,6 +1879,7 @@
 extern AVCodec mp2_encoder;
 extern AVCodec mp3lame_encoder;
 extern AVCodec oggvorbis_encoder;
+extern AVCodec oggtheora_encoder;
 extern AVCodec faac_encoder;
 extern AVCodec xvid_encoder;
 extern AVCodec mpeg1video_encoder;
@@ -1954,6 +1957,7 @@
 extern AVCodec huffyuv_decoder;
 extern AVCodec ffvhuff_decoder;
 extern AVCodec oggvorbis_decoder;
+extern AVCodec oggtheora_decoder;
 extern AVCodec cyuv_decoder;
 extern AVCodec h264_decoder;
 extern AVCodec indeo3_decoder;