[NUT-devel] [nut]: r245 - trunk/libnut/demuxer.c

ods15 subversion at mplayerhq.hu
Sat Nov 18 16:37:32 CET 2006


Author: ods15
Date: Sat Nov 18 16:37:32 2006
New Revision: 245

Modified:
   trunk/libnut/demuxer.c

Log:
ERROR(err, err) => CHECK(err)


Modified: trunk/libnut/demuxer.c
==============================================================================
--- trunk/libnut/demuxer.c	(original)
+++ trunk/libnut/demuxer.c	Sat Nov 18 16:37:32 2006
@@ -738,7 +738,7 @@
 
 			// EOF is a legal error here - when reading the last headers in file
 			if ((err = get_bytes(nut->i, 8, &tmp)) == NUT_ERR_EOF) { err = 0; tmp = SYNCPOINT_STARTCODE; }
-			ERROR(err, err); // if get_bytes returns EAGAIN or a memory error, check for that
+			CHECK(err); // if get_bytes returns EAGAIN or a memory error, check for that
 		} while (tmp != SYNCPOINT_STARTCODE);
 		if (tmp == SYNCPOINT_STARTCODE) { // success!
 			nut->last_syncpoint = nut->before_seek = nut->seek_status = 0;
@@ -907,7 +907,7 @@
 		}
 		// EOF is a legal error here - when reading the last headers in file
 		if ((err = get_bytes(nut->i, 8, &tmp)) == NUT_ERR_EOF) { tmp = err = 0; break; }
-		ERROR(err, err); // it's just barely possible for get_bytes to return a memory error, check for that
+		CHECK(err); // it's just barely possible for get_bytes to return a memory error, check for that
 	}
 	if (tmp == SYNCPOINT_STARTCODE) nut->i->buf_ptr -= 8;
 



More information about the NUT-devel mailing list