summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2007-02-13 23:20:35 +0000
committerDiego Biurrun <diego@biurrun.de>2007-02-13 23:20:35 +0000
commit1367cffd66cca1612dd60212813e1c3c96021315 (patch)
tree85175099c9ec4b17bd643aa5ac2879fc5adc58c8
parent8fa36ae09dddb1b639b4df5d505c0dbcf4e916e4 (diff)
Ogg is not Vorbis.
Originally committed as revision 7966 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/ogg.c4
-rw-r--r--libavformat/ogg2.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/ogg.c b/libavformat/ogg.c
index 369fa4639d..c98bb22735 100644
--- a/libavformat/ogg.c
+++ b/libavformat/ogg.c
@@ -155,8 +155,8 @@ static int ogg_write_trailer(AVFormatContext *avfcontext) {
AVOutputFormat ogg_muxer = {
"ogg",
- "Ogg Vorbis",
- "audio/x-vorbis",
+ "Ogg format",
+ "application/ogg",
"ogg",
sizeof(OggContext),
CODEC_ID_VORBIS,
diff --git a/libavformat/ogg2.c b/libavformat/ogg2.c
index 64e7733d56..8ca7b2d136 100644
--- a/libavformat/ogg2.c
+++ b/libavformat/ogg2.c
@@ -67,8 +67,8 @@ ogg_write_trailer (AVFormatContext * avfcontext)
AVOutputFormat ogg_muxer = {
"ogg",
- "Ogg Vorbis",
- "audio/x-vorbis",
+ "Ogg format",
+ "application/ogg",
"ogg",
sizeof (OggContext),
CODEC_ID_VORBIS,