har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Give Ogg muxer a lib prefix in the name like we do with all other formats

Browse Source 
implemented through external libraries, plus rename the files accordingly.

Originally committed as revision 10956 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2007-11-08 11:22:29 +00:00
parent 3240941b25
commit f9e4ed19d2
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/Makefile
View File

@ -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

3
libavformat/allformats.c
View File

@ -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);

4
libavformat/ogg.c → libavformat/libogg.c
View File

@ -151,8 +151,8 @@ static int ogg_write_trailer(AVFormatContext *avfcontext) {
}
AVOutputFormat ogg_muxer = {
"ogg",
AVOutputFormat libogg_muxer = {
"libogg",
"Ogg format",
"application/ogg",
"ogg",