From f9e4ed19d20103220b51bf1d2bd661fc48224036 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Thu, 8 Nov 2007 11:22:29 +0000
Subject: [PATCH] Give Ogg muxer a lib prefix in the name like we do with all
 other formats implemented through external libraries, plus rename the files
 accordingly.

Originally committed as revision 10956 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/Makefile            | 2 +-
 libavformat/allformats.c        | 3 ++-
 libavformat/{ogg.c => libogg.c} | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename libavformat/{ogg.c => libogg.c} (99%)

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 2bc7efc0d5..e97236c80c 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -113,7 +113,6 @@ OBJS-$(CONFIG_OGG_DEMUXER)               += oggdec.o         \
                                             oggparseflac.o   \
                                             oggparseogm.o    \
                                             riff.o
-OBJS-$(CONFIG_OGG_MUXER)                 += ogg.o
 OBJS-$(CONFIG_OSS_DEMUXER)               += audio.o
 OBJS-$(CONFIG_OSS_MUXER)                 += audio.o
 OBJS-$(CONFIG_PSP_MUXER)                 += movenc.o riff.o isom.o
@@ -161,6 +160,7 @@ OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER)      += yuv4mpeg.o
 OBJS-$(CONFIG_LIBDC1394_DEMUXER)         += libdc1394.o
 OBJS-$(CONFIG_LIBNUT_DEMUXER)            += libnut.o riff.o
 OBJS-$(CONFIG_LIBNUT_MUXER)              += libnut.o riff.o
+OBJS-$(CONFIG_LIBOGG_MUXER)              += libogg.o
 
 OBJS-$(CONFIG_VHOOK)                     += framehook.o
 
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 52529974d1..ad5c6af028 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -122,7 +122,7 @@ void av_register_all(void)
     REGISTER_MUXER    (NULL, null);
     REGISTER_MUXDEMUX (NUT, nut);
     REGISTER_DEMUXER  (NUV, nuv);
-    REGISTER_MUXDEMUX (OGG, ogg);
+    REGISTER_DEMUXER  (OGG, ogg);
     REGISTER_MUXDEMUX (OSS, oss);
     REGISTER_MUXDEMUX (PCM_ALAW,  pcm_alaw);
     REGISTER_MUXDEMUX (PCM_MULAW, pcm_mulaw);
@@ -172,6 +172,7 @@ void av_register_all(void)
     /* external libraries */
     REGISTER_DEMUXER  (LIBDC1394, libdc1394);
     REGISTER_MUXDEMUX (LIBNUT, libnut);
+    REGISTER_MUXER    (LIBOGG, libogg);
 
     /* protocols */
     REGISTER_PROTOCOL (FILE, file);
diff --git a/libavformat/ogg.c b/libavformat/libogg.c
similarity index 99%
rename from libavformat/ogg.c
rename to libavformat/libogg.c
index 71906bdc73..9ed4f1d5f0 100644
--- a/libavformat/ogg.c
+++ b/libavformat/libogg.c
@@ -151,8 +151,8 @@ static int ogg_write_trailer(AVFormatContext *avfcontext) {
 }
 
 
-AVOutputFormat ogg_muxer = {
-    "ogg",
+AVOutputFormat libogg_muxer = {
+    "libogg",
     "Ogg format",
     "application/ogg",
     "ogg",