# HG changeset patch # User rtogni # Date 1183152117 0 # Node ID c056ed2819e8c169c958a16c6247569ca5802b8a # Parent 2166559d24e5188a4b0d20fcbf4101a0cd0a06ca 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 diff -r 2166559d24e5 -r c056ed2819e8 stream/asf_streaming.c --- a/stream/asf_streaming.c Fri Jun 29 14:59:24 2007 +0000 +++ b/stream/asf_streaming.c Fri Jun 29 21:21:57 2007 +0000 @@ -534,7 +534,6 @@ (!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 -r 2166559d24e5 -r c056ed2819e8 stream/network.c --- a/stream/network.c Fri Jun 29 14:59:24 2007 +0000 +++ b/stream/network.c Fri Jun 29 21:21:57 2007 +0000 @@ -69,7 +69,6 @@ { "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 @@ { "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 },