[MPlayer-cvslog] r23695 - in trunk/stream: asf_streaming.c network.c

[rtogni]

Author: rtogni
Date: Fri Jun 29 23:21:57 2007
New Revision: 23695

Log:
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


Modified:
   trunk/stream/asf_streaming.c
   trunk/stream/network.c

Modified: trunk/stream/asf_streaming.c
==============================================================================
--- trunk/stream/asf_streaming.c	(original)
+++ trunk/stream/asf_streaming.c	Fri Jun 29 23:21:57 2007
@@ -534,7 +534,6 @@ static int asf_http_streaming_type(char 
 				(!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);

Modified: trunk/stream/network.c
==============================================================================
--- trunk/stream/network.c	(original)
+++ trunk/stream/network.c	Fri Jun 29 23:21:57 2007
@@ -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 },