From 59a387a829dc2fbebf8c9c507d706022fc5da45b Mon Sep 17 00:00:00 2001 From: rtogni Date: Fri, 29 Jun 2007 21:21:57 +0000 Subject: wvx files (mimetype video/x-ms-wvx) are asx playlists. Fix bugzilla #750 http://www.ntt-fukushima.com/sora/mado_live/jr_aizu/gazai/jrwaka500k.wvx Patch by Sergey Svishchev | svs ropnet ru | on bugzilla git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23695 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/asf_streaming.c | 1 - stream/network.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'stream') 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 }, -- cgit v1.2.3