summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libmpdemux/extension.c3
-rw-r--r--libmpdemux/network.c5
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;