diff options
| author | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-05-14 23:10:43 +0000 |
|---|---|---|
| committer | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-05-14 23:10:43 +0000 |
| commit | 571c94b3a78d914b3da3b58ce4841553ba8576fd (patch) | |
| tree | a11c661111ee0de1831a99a3f45069a903bec337 /libmpdemux | |
| parent | 1499a0df6fe762727dd9156fe577fb20f46f1083 (diff) | |
| download | mpv-571c94b3a78d914b3da3b58ce4841553ba8576fd.tar.bz2 mpv-571c94b3a78d914b3da3b58ce4841553ba8576fd.tar.xz | |
Add detection of nsa streamed by aol ultravox server
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12478 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/extension.c | 3 | ||||
| -rw-r--r-- | libmpdemux/network.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libmpdemux/extension.c b/libmpdemux/extension.c index 661d511937..d290bb55ea 100644 --- a/libmpdemux/extension.c +++ b/libmpdemux/extension.c @@ -49,7 +49,8 @@ static struct { { "mid", DEMUXER_TYPE_XMMS }, { "midi", DEMUXER_TYPE_XMMS }, { "vqf", DEMUXER_TYPE_XMMS }, - { "nsv", DEMUXER_TYPE_NSV } + { "nsv", DEMUXER_TYPE_NSV }, + { "nsa", DEMUXER_TYPE_NSV } }; int demuxer_type_by_filename(char* filename){ diff --git a/libmpdemux/network.c b/libmpdemux/network.c index 35366b768f..528af01590 100644 --- a/libmpdemux/network.c +++ b/libmpdemux/network.c @@ -94,7 +94,8 @@ static struct { // OGG Streaming { "application/x-ogg", DEMUXER_TYPE_OGG }, // NullSoft Streaming Video - { "video/nsv", DEMUXER_TYPE_NSV} + { "video/nsv", DEMUXER_TYPE_NSV}, + { "misc/ultravox", DEMUXER_TYPE_NSV} }; @@ -769,7 +770,7 @@ extension=NULL; // If content-type == video/nsv we most likely have a winamp video stream // otherwise it should be mp3. if there are more types consider adding mime type // handling like later - if ( (field_data = http_get_field(http_hdr, "content-type")) != NULL && !strcmp(field_data, "video/nsv")) + if ( (field_data = http_get_field(http_hdr, "content-type")) != NULL && (!strcmp(field_data, "video/nsv") || !strcmp(field_data, "misc/ultravox"))) *file_format = DEMUXER_TYPE_NSV; else *file_format = DEMUXER_TYPE_AUDIO; |