[MPlayer-dev-eng] [PATCH] Recognize audio/ogg as an OGG mimetype

[Ben Boeckel]

On Tue, Dec 04, 2012 at 01:23:50 -0500, Ben Boeckel wrote:
> I've been tracking down why an upgrade from MPD 0.15.8 to 0.17 has been
> causing me issues. One is that the mimetype is now 'audio/ogg' (instead
> of 'application/x-ogg') which MPlayer does not recognize and instead
> falls back to default handling of the stream. A patch is attached with
> more description. If Changelog and/or AUTHORS should be updated, I can
> spin a new patch. Comments welcome.

Patch actually attached this time. It's based off of the 2012-12-04
nightly svn export tarball from the download page.

--Ben
-------------- next part --------------
>From 3e3004694742b8dcd1835a24de68bffff307e408 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <mathstuf at gmail.com>
Date: Tue, 4 Dec 2012 01:16:02 -0500
Subject: [PATCH] Recognize audio/ogg as an OGG mimetype

Newer MPD versions (>= 0.15.13) stream OGG via the httpd output with the
audio/ogg mimetype. MPlayer detects that the stream is OGG correctly,
but the tag parsing and pausing do not work. Tags are not parsed from
the stream and when paused, MPD (>= 0.16; older versions stopped
streaming any data) will output silence over the network which will be
buffered if the mimetype wasn't recognized. If it is recognized, the
cache is flushed and no buffering occurs until the stream is unpaused.
---
 stream/network.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stream/network.c b/stream/network.c
index 2dbcc93..43d703f 100644
--- a/stream/network.c
+++ b/stream/network.c
@@ -104,6 +104,7 @@ const mime_struct_t mime_type_table[] = {
 	// OGG Streaming
 	{ "application/ogg", DEMUXER_TYPE_OGG },
 	{ "application/x-ogg", DEMUXER_TYPE_OGG },
+	{ "audio/ogg", DEMUXER_TYPE_OGG },
 	// NullSoft Streaming Video
 	{ "video/nsv", DEMUXER_TYPE_NSV},
 	{ "misc/ultravox", DEMUXER_TYPE_NSV},
-- 
1.8.0.1