Ogg is not Vorbis.

Originally committed as revision 7966 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/ogg.c b/libavformat/ogg.c
index 369fa46..c98bb22 100644 (file)
--- 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 64e7733..8ca7b2d 100644 (file)
--- 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,