Mercurial > mplayer.hg

changeset 18805:1f8d9010ce2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
exit() is not allowed in any other function than main(); removed
author nicodvb
date Sat, 24 Jun 2006 09:41:41 +0000
parents 2cc4eeaa0627
children daccad6cb91d
files libmpdemux/rtp.c
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/rtp.c	Sat Jun 24 09:30:23 2006 +0000
+++ b/libmpdemux/rtp.c	Sat Jun 24 09:41:41 2006 +0000
@@ -84,6 +84,8 @@
 	static int is_first = 1;
 	
 	getrtp2(fd, &rh, &data, &length);
+	if(!length)
+		return 0;
 	seq = rh.b.sequence;
 	
 	newseq = seq - rtpbuf.seq[rtpbuf.first];
@@ -350,15 +352,13 @@
   int headerSize;
   int lengthPacket;
   lengthPacket=recv(fd,buf,1590,0);
-  if (lengthPacket==0)
-    exit(1);
-  if (lengthPacket<0) {
+  if (lengthPacket<0)
     mp_msg(MSGT_NETWORK,MSGL_ERR,"rtp: socket read error\n");
-    exit(2);
-  }
-  if (lengthPacket<12) {
+  else if (lengthPacket<12)
     mp_msg(MSGT_NETWORK,MSGL_ERR,"rtp: packet too small (%d) to be an rtp frame (>12bytes)\n", lengthPacket);
-    exit(3);
+  if(lengthPacket<12) {
+    *lengthData = 0;
+    return 0;
   }
   rh->b.v  = (unsigned int) ((buf[0]>>6)&0x03);
   rh->b.p  = (unsigned int) ((buf[0]>>5)&0x01);