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

Bertrand Baudet bertrand at mplayer.dev.hu
Thu Jan 10 02:42:34 CET 2002


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

Modified Files:
	asf_streaming.c 
Log Message:
Changed the return value of the start function. Doesn't return the fd
anymore. Just -1 for fail and 0 for OK.


Index: asf_streaming.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/asf_streaming.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- asf_streaming.c	8 Jan 2002 07:31:29 -0000	1.17
+++ asf_streaming.c	10 Jan 2002 01:42:31 -0000	1.18
@@ -610,15 +610,15 @@
 				}
 				break;
 			case ASF_Redirector_e:
-			  if( http_hdr->body_size>0 ) {
-			    if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) {
-			      http_free( http_hdr );
-			      return -1;
-			    }
-			  }
-			  stream->type = STREAMTYPE_PLAYLIST;
-			  done = 1;
-			  break;
+				if( http_hdr->body_size>0 ) {
+					if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) {
+						http_free( http_hdr );
+						return -1;
+					}
+				}
+				stream->type = STREAMTYPE_PLAYLIST;
+				done = 1;
+				break;
 			case ASF_Unknown_e:
 			default:
 				printf("Unknown ASF streaming type\n");
@@ -629,7 +629,7 @@
 	// Check if we got a redirect.	
 	} while(!done);
 
-	stream->fd= fd;
+	stream->fd = fd;
 	if( streaming_type==ASF_PlainText_e || streaming_type==ASF_Redirector_e ) {
 		stream->streaming_ctrl->streaming_read = nop_streaming_read;
 		stream->streaming_ctrl->streaming_seek = nop_streaming_seek;
@@ -642,6 +642,6 @@
 	stream->streaming_ctrl->status = streaming_playing_e;
 
 	http_free( http_hdr );
-	return fd;
+	return 0;
 }
 




More information about the MPlayer-cvslog mailing list