Commit f9e4ed19 authored by Diego Biurrun's avatar Diego Biurrun

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
parent 3240941b
...@@ -113,7 +113,6 @@ OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \ ...@@ -113,7 +113,6 @@ OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \
oggparseflac.o \ oggparseflac.o \
oggparseogm.o \ oggparseogm.o \
riff.o riff.o
OBJS-$(CONFIG_OGG_MUXER) += ogg.o
OBJS-$(CONFIG_OSS_DEMUXER) += audio.o OBJS-$(CONFIG_OSS_DEMUXER) += audio.o
OBJS-$(CONFIG_OSS_MUXER) += audio.o OBJS-$(CONFIG_OSS_MUXER) += audio.o
OBJS-$(CONFIG_PSP_MUXER) += movenc.o riff.o isom.o OBJS-$(CONFIG_PSP_MUXER) += movenc.o riff.o isom.o
...@@ -161,6 +160,7 @@ OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.o ...@@ -161,6 +160,7 @@ OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.o
OBJS-$(CONFIG_LIBDC1394_DEMUXER) += libdc1394.o OBJS-$(CONFIG_LIBDC1394_DEMUXER) += libdc1394.o
OBJS-$(CONFIG_LIBNUT_DEMUXER) += libnut.o riff.o OBJS-$(CONFIG_LIBNUT_DEMUXER) += libnut.o riff.o
OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o riff.o OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o riff.o
OBJS-$(CONFIG_LIBOGG_MUXER) += libogg.o
OBJS-$(CONFIG_VHOOK) += framehook.o OBJS-$(CONFIG_VHOOK) += framehook.o
......
...@@ -122,7 +122,7 @@ void av_register_all(void) ...@@ -122,7 +122,7 @@ void av_register_all(void)
REGISTER_MUXER (NULL, null); REGISTER_MUXER (NULL, null);
REGISTER_MUXDEMUX (NUT, nut); REGISTER_MUXDEMUX (NUT, nut);
REGISTER_DEMUXER (NUV, nuv); REGISTER_DEMUXER (NUV, nuv);
REGISTER_MUXDEMUX (OGG, ogg); REGISTER_DEMUXER (OGG, ogg);
REGISTER_MUXDEMUX (OSS, oss); REGISTER_MUXDEMUX (OSS, oss);
REGISTER_MUXDEMUX (PCM_ALAW, pcm_alaw); REGISTER_MUXDEMUX (PCM_ALAW, pcm_alaw);
REGISTER_MUXDEMUX (PCM_MULAW, pcm_mulaw); REGISTER_MUXDEMUX (PCM_MULAW, pcm_mulaw);
...@@ -172,6 +172,7 @@ void av_register_all(void) ...@@ -172,6 +172,7 @@ void av_register_all(void)
/* external libraries */ /* external libraries */
REGISTER_DEMUXER (LIBDC1394, libdc1394); REGISTER_DEMUXER (LIBDC1394, libdc1394);
REGISTER_MUXDEMUX (LIBNUT, libnut); REGISTER_MUXDEMUX (LIBNUT, libnut);
REGISTER_MUXER (LIBOGG, libogg);
/* protocols */ /* protocols */
REGISTER_PROTOCOL (FILE, file); REGISTER_PROTOCOL (FILE, file);
......
...@@ -151,8 +151,8 @@ static int ogg_write_trailer(AVFormatContext *avfcontext) { ...@@ -151,8 +151,8 @@ static int ogg_write_trailer(AVFormatContext *avfcontext) {
} }
AVOutputFormat ogg_muxer = { AVOutputFormat libogg_muxer = {
"ogg", "libogg",
"Ogg format", "Ogg format",
"application/ogg", "application/ogg",
"ogg", "ogg",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment