[Mplayer-cvslog] CVS: main/libmpdemux extension.c, 1.6, 1.7 network.c, 1.99, 1.100

[Roberto Togni CVS]

CVS change done by Roberto Togni CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv15787

Modified Files:
	extension.c network.c 
Log Message:
Add detection of nsa streamed by aol ultravox server


Index: extension.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/extension.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- extension.c	12 Apr 2004 14:19:12 -0000	1.6
+++ extension.c	14 May 2004 23:10:43 -0000	1.7
@@ -49,7 +49,8 @@
         { "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){

Index: network.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/network.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- network.c	1 May 2004 23:35:25 -0000	1.99
+++ network.c	14 May 2004 23:10:43 -0000	1.100
@@ -94,7 +94,8 @@
 	// 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 @@
 						// 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;