summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--stream/asf_streaming.c1
-rw-r--r--stream/network.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/stream/asf_streaming.c b/stream/asf_streaming.c
index 7edb0d856a..b186ea944d 100644
--- a/stream/asf_streaming.c
+++ b/stream/asf_streaming.c
@@ -534,7 +534,6 @@ static int asf_http_streaming_type(char *content_type, char *features, HTTP_head
(!strcasecmp(content_type, "audio/x-ms-wma")) ||
(!strcasecmp(content_type, "video/x-ms-asf")) ||
(!strcasecmp(content_type, "video/x-ms-afs")) ||
- (!strcasecmp(content_type, "video/x-ms-wvx")) ||
(!strcasecmp(content_type, "video/x-ms-wmv")) ||
(!strcasecmp(content_type, "video/x-ms-wma")) ) {
mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ASFRedirector);
diff --git a/stream/network.c b/stream/network.c
index 8ac983ebe1..84e1263260 100644
--- a/stream/network.c
+++ b/stream/network.c
@@ -69,7 +69,6 @@ mime_struct_t mime_type_table[] = {
{ "audio/x-ms-wma", DEMUXER_TYPE_ASF },
{ "video/x-ms-asf", DEMUXER_TYPE_ASF },
{ "video/x-ms-afs", DEMUXER_TYPE_ASF },
- { "video/x-ms-wvx", DEMUXER_TYPE_ASF },
{ "video/x-ms-wmv", DEMUXER_TYPE_ASF },
{ "video/x-ms-wma", DEMUXER_TYPE_ASF },
{ "application/x-mms-framed", DEMUXER_TYPE_ASF },
@@ -77,6 +76,7 @@ mime_struct_t mime_type_table[] = {
{ "application/octet-stream", DEMUXER_TYPE_UNKNOWN },
// Playlists
{ "video/x-ms-wmx", DEMUXER_TYPE_PLAYLIST },
+ { "video/x-ms-wvx", DEMUXER_TYPE_PLAYLIST },
{ "audio/x-scpls", DEMUXER_TYPE_PLAYLIST },
{ "audio/x-mpegurl", DEMUXER_TYPE_PLAYLIST },
{ "audio/x-pls", DEMUXER_TYPE_PLAYLIST },