summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorbertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-11-05 19:03:52 +0000
committerbertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-11-05 19:03:52 +0000
commit2fd8dcc165ab2f6c841dcc242d76f3e0a9ff76c8 (patch)
tree85f6339906ef35a132e727b5f1cea05fe793a6e1 /libmpdemux
parentf7dc9a8051f3d9731a9f077785492e1729ad5be4 (diff)
downloadmpv-2fd8dcc165ab2f6c841dcc242d76f3e0a9ff76c8.tar.bz2
mpv-2fd8dcc165ab2f6c841dcc242d76f3e0a9ff76c8.tar.xz
Added OGG streaming support, patch from Balatoni Denes <pnis@coder.hu>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8115 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/network.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libmpdemux/network.c b/libmpdemux/network.c
index 5bd9724588..1f76cc26b7 100644
--- a/libmpdemux/network.c
+++ b/libmpdemux/network.c
@@ -72,7 +72,10 @@ static struct {
{ "audio/x-mpegurl", DEMUXER_TYPE_PLAYLIST },
{ "audio/x-pls", DEMUXER_TYPE_PLAYLIST },
// Real Media
- { "audio/x-pn-realaudio", DEMUXER_TYPE_REAL }
+ { "audio/x-pn-realaudio", DEMUXER_TYPE_REAL },
+ // OGG Streaming
+ { "application/x-ogg", DEMUXER_TYPE_OGG }
+
};
static struct {
@@ -94,6 +97,7 @@ static struct {
{ "ra", DEMUXER_TYPE_REAL },
{ "y4m", DEMUXER_TYPE_Y4M },
{ "mp3", DEMUXER_TYPE_AUDIO },
+ { "ogg", DEMUXER_TYPE_OGG },
{ "wav", DEMUXER_TYPE_AUDIO },
{ "pls", DEMUXER_TYPE_PLAYLIST },
{ "m3u", DEMUXER_TYPE_PLAYLIST }
@@ -871,6 +875,7 @@ streaming_start(stream_t *stream, int *demuxer_type, URL_t *url) {
case DEMUXER_TYPE_FILM:
case DEMUXER_TYPE_ROQ:
case DEMUXER_TYPE_AUDIO:
+ case DEMUXER_TYPE_OGG:
case DEMUXER_TYPE_PLAYLIST:
case DEMUXER_TYPE_UNKNOWN:
// Generic start, doesn't need to filter