[Mplayer-cvslog] CVS: main/libmpdemux/realrtsp rmff.c,1.1,1.2 rtsp.c,1.2,1.3

Alex Beregszaszi alex at mplayerhq.hu
Thu May 29 21:34:05 CEST 2003


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

Modified Files:
	rmff.c rtsp.c 
Log Message:
Using recv/send instead read/write for proper MinGW support (it's a 4.2BSD standard). Patch by FloDt <flodt8 at yahoo.de>

Index: rmff.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/realrtsp/rmff.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rmff.c	17 Apr 2003 20:38:57 -0000	1.1
+++ rmff.c	29 May 2003 19:34:01 -0000	1.2
@@ -502,7 +502,7 @@
 
   do {
     buf = xbuffer_ensure_size(buf, index+8);
-    read(fd, buf+index, 8);
+    recv(fd, buf+index, 8, 0);
     chunk_type=BE_32(buf+index); index+=4;
     chunk_size=BE_32(buf+index); index+=4;
 
@@ -514,7 +514,7 @@
       case RMF_TAG:
       case PROP_TAG:
         buf = xbuffer_ensure_size(buf, index+chunk_size-8);
-        read(fd, buf+index, (chunk_size-8));
+        recv(fd, buf+index, (chunk_size-8), 0);
 	index+=(chunk_size-8);
         break;
       default:

Index: rtsp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/realrtsp/rtsp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rtsp.c	19 Apr 2003 14:54:03 -0000	1.2
+++ rtsp.c	29 May 2003 19:34:01 -0000	1.3
@@ -158,7 +158,7 @@
   while (total < len){ 
     int n;
 
-    n = write (s, &buf[total], len - total);
+    n = send (s, &buf[total], len - total, 0);
 
     if (n > 0)
       total += n;
@@ -181,7 +181,7 @@
 
   while (total < count) {
   
-    ret=read (fd, ((uint8_t*)buf)+total, count-total);
+    ret=recv (fd, ((uint8_t*)buf)+total, count-total, 0);
 
     if (ret<0) {
       if(errno == EAGAIN) {



More information about the MPlayer-cvslog mailing list