[Mplayer-cvslog] CVS: main/libmpdemux network.c,1.17,1.18

[Bertrand Baudet]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mplayer:/var/tmp.root/cvs-serv11213

Modified Files:
	network.c 
Log Message:
If the demuxer type is unknown it will start an http streaming.


Index: network.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/network.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- network.c	19 Dec 2001 01:59:25 -0000	1.17
+++ network.c	19 Dec 2001 09:04:03 -0000	1.18
@@ -44,7 +44,6 @@
 	{ "video/x-ms-wvx", DEMUXER_TYPE_ASF },
 	{ "video/x-ms-wmv", DEMUXER_TYPE_ASF },
 	{ "video/x-ms-wma", DEMUXER_TYPE_ASF },
-	{ "text/plain", DEMUXER_TYPE_ASF },	// This is the mime type that a web server send when sending a raw asf without streaming encapsulation.
 };
 
 static struct {
@@ -450,16 +449,22 @@
 			// Need to filter the network stream.
 			// ASF raw stream is encapsulated.
 			ret = asf_streaming_start( stream );
+			if( ret<0 ) {
+				printf("asf_streaming_start failed\n");
+			}
 			break;
 		case DEMUXER_TYPE_AVI:
 		case DEMUXER_TYPE_MOV:
 		case DEMUXER_TYPE_MPEG_ES:
 		case DEMUXER_TYPE_MPEG_PS:
+		case DEMUXER_TYPE_UNKNOWN:
 			// Generic start, doesn't need to filter
 			// the network stream, it's a raw stream
 			ret = nop_streaming_start( stream );
+			if( ret<0 ) {
+				printf("asf_streaming_start failed\n");
+			}
 			break;
-		case DEMUXER_TYPE_UNKNOWN:
 		default:
 			printf("Unable to detect the streaming type\n");
 			ret = -1;
@@ -467,10 +472,7 @@
 
 	if( ret<0 ) {
 		free( stream->streaming_ctrl );
-	} else {
-//		bufferize( stream );
-	}
-
+	} 
 	return ret;
 }