[FFmpeg-cvslog] r10956 - in trunk/libavformat: Makefile allformats.c libogg.c ogg.c

[diego]

Author: diego
Date: Thu Nov  8 12:22:29 2007
New Revision: 10956

Log:
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.


Added:
   trunk/libavformat/libogg.c
      - copied, changed from r10937, /trunk/libavformat/ogg.c
Removed:
   trunk/libavformat/ogg.c
Modified:
   trunk/libavformat/Makefile
   trunk/libavformat/allformats.c

Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile	(original)
+++ trunk/libavformat/Makefile	Thu Nov  8 12:22:29 2007
@@ -113,7 +113,6 @@ OBJS-$(CONFIG_OGG_DEMUXER)              
                                             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)     
 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
 

Modified: trunk/libavformat/allformats.c
==============================================================================
--- trunk/libavformat/allformats.c	(original)
+++ trunk/libavformat/allformats.c	Thu Nov  8 12:22:29 2007
@@ -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);

Copied: trunk/libavformat/libogg.c (from r10937, /trunk/libavformat/ogg.c)
==============================================================================
--- /trunk/libavformat/ogg.c	(original)
+++ trunk/libavformat/libogg.c	Thu Nov  8 12:22:29 2007
@@ -151,8 +151,8 @@ static int ogg_write_trailer(AVFormatCon
 }
 
 
-AVOutputFormat ogg_muxer = {
-    "ogg",
+AVOutputFormat libogg_muxer = {
+    "libogg",
     "Ogg format",
     "application/ogg",
     "ogg",