[NUT-devel] [nut]: r229 - in trunk/libnut: demuxer.c libnut.h

[ods15]

Author: ods15
Date: Fri Nov 17 21:48:33 2006
New Revision: 229

Modified:
   trunk/libnut/demuxer.c
   trunk/libnut/libnut.h

Log:
make NUT_ERR_OUT_OF_MEM correctly a fatal error before trying error recovery...


Modified: trunk/libnut/demuxer.c
==============================================================================
--- trunk/libnut/demuxer.c	(original)
+++ trunk/libnut/demuxer.c	Fri Nov 17 21:48:33 2006
@@ -854,7 +854,7 @@
 	}
 
 	while ((err = get_packet(nut, pd, NULL)) == -1) flush_buf(nut->i);
-	if (err > NUT_ERR_EAGAIN) { // some error occured!
+	if (err > NUT_ERR_OUT_OF_MEM) { // some error occured!
 		fprintf(stderr, "NUT: %s\n", nut_error(err));
 		// rewind as much as possible
 		if (nut->i->isc.seek) seek_buf(nut->i, nut->last_syncpoint + 8, SEEK_SET);

Modified: trunk/libnut/libnut.h
==============================================================================
--- trunk/libnut/libnut.h	(original)
+++ trunk/libnut/libnut.h	Fri Nov 17 21:48:33 2006
@@ -122,6 +122,7 @@
 	NUT_ERR_NO_ERROR = 0,
 	NUT_ERR_EOF = 1,
 	NUT_ERR_EAGAIN = 2,
+	NUT_ERR_OUT_OF_MEM = 3, // these first 3 errors are "fatal" errors, the rest are simple stream corruption
 	NUT_ERR_GENERAL_ERROR,
 	NUT_ERR_BAD_VERSION,
 	NUT_ERR_NOT_FRAME_NOT_N,
@@ -136,7 +137,6 @@
 	NUT_ERR_BAD_STREAM_ORDER,
 	NUT_ERR_NOSTREAM_STARTCODE,
 	NUT_ERR_BAD_EOF,
-	NUT_ERR_OUT_OF_MEM,
 };
 
 // Muxer