Index: configure
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
retrieving revision 1.166
diff -u -b -B -u -r1.166 configure
--- configure	16 Mar 2005 19:11:57 -0000	1.166
+++ configure	6 Apr 2005 16:51:10 -0000
@@ -16,7 +16,8 @@
 echo "  --libdir=DIR             install libs in DIR [PREFIX/lib]"
 echo "  --mandir=DIR             man documentation in DIR [PREFIX/man]"
 echo "  --enable-mp3lame         enable mp3 encoding via libmp3lame [default=no]"
-echo "  --enable-ogg             enable ogg support via libogg [default=no]"
+echo "  --enable-libogg          enable ogg support via libogg [default=no]"
+echo "  --enable-ogg             enable ogg support [default=no]"
 echo "  --enable-vorbis          enable vorbis support via libvorbis [default=no]"
 echo "  --enable-theora          enable theora support via libtheora [default=no]"
 echo "  --enable-faad            enable faad support via libfaad [default=no]"
@@ -155,6 +156,7 @@
 zlib="yes"
 mp3lame="no"
 ogg="no"
+libogg="no"
 vorbis="no"
 theora="no"
 faad="no"
@@ -432,6 +434,8 @@
   ;;
   --enable-mp3lame) mp3lame="yes"
   ;;
+  --enable-libogg) libogg="yes"
+  ;;
   --enable-ogg) ogg="yes"
   ;;
   --enable-vorbis) vorbis="yes"
@@ -492,16 +496,16 @@
 done
 
 if test "$theora" = "yes" ; then
-    if test "$ogg" = "no" ; then
-        echo "Ogg must be enabled to enable Theora"     
+    if test "$libogg" = "no"; then
+        echo "libogg must be enabled to enable Theora"     
         fail="yes"
         theora="no"
     fi
 fi
 
 if test "$vorbis" = "yes" ; then
-    if test "$ogg" = "no" ; then
-        echo "Ogg must be enabled to enable Vorbis"
+    if test "$libogg" = "no"; then
+        echo "libogg must be enabled to enable Vorbis"
         fail="yes"
         vorbis="no"
     fi
@@ -1095,6 +1099,7 @@
 echo "gprof enabled    $gprof"
 echo "zlib enabled     $zlib"
 echo "mp3lame enabled  $mp3lame"
+echo "libogg enabled   $libogg"
 echo "ogg enabled      $ogg"
 echo "vorbis enabled   $vorbis"
 echo "theora enabled   $theora"
@@ -1395,11 +1400,19 @@
   echo "CONFIG_MP3LAME=yes" >> config.mak
 fi
 
-if test "$ogg" = "yes" ; then
+if test "$libogg" = "yes" ; then
   echo "#define CONFIG_LIBOGG 1" >> $TMPH
   echo "CONFIG_LIBOGG=yes" >> config.mak
 fi
 
+if test "$ogg" = "yes"; then
+  echo "#define CONFIG_OGG 1" >> $TMPH
+  echo "CONFIG_OGG=yes" >> config.mak
+fi
+
+
+
+
 if test "$vorbis" = "yes" ; then
   echo "#define CONFIG_LIBVORBIS 1" >> $TMPH
   echo "CONFIG_LIBVORBIS=yes" >> config.mak
Index: libavformat/Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/Makefile,v
retrieving revision 1.85
diff -u -b -B -u -r1.85 Makefile
--- libavformat/Makefile	16 Mar 2005 19:11:58 -0000	1.85
+++ libavformat/Makefile	6 Apr 2005 16:51:13 -0000
@@ -65,9 +65,16 @@
 endif
 endif
 
+ifeq ($(CONFIG_OGG),yes)
+OBJS+= ogg2.o oggparsevorbis.o
+endif
+
 ifeq ($(CONFIG_LIBOGG),yes)
+ifeq ($(CONFIG_OGG),no)
 OBJS+= ogg.o
 endif
+endif
+
 
 ifeq ($(TARGET_ARCH_SPARC64),yes)
 CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
Index: libavformat/allformats.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/allformats.c,v
retrieving revision 1.45
diff -u -b -B -u -r1.45 allformats.c
--- libavformat/allformats.c	24 Feb 2005 15:18:02 -0000	1.45
+++ libavformat/allformats.c	6 Apr 2005 16:51:13 -0000
@@ -82,7 +82,7 @@
 #endif
     yuv4mpeg_init();
     
-#ifdef CONFIG_LIBOGG
+#if defined(CONFIG_LIBOGG) || defined(CONFIG_OGG)
     ogg_init();
 #endif