[NUT-devel] [NUT] (ods15): r97 - in /trunk/libnut: demuxer.c priv.h

[syncmail at mplayerhq.hu]

Author: ods15
Date: Sat Mar 11 20:04:14 2006
New Revision: 97

Log:
more verbose errors

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

Modified: trunk/libnut/demuxer.c
==============================================================================
--- trunk/libnut/demuxer.c (original)
+++ trunk/libnut/demuxer.c Sat Mar 11 20:04:14 2006
@@ -552,7 +552,7 @@
 	}
 
 	// error checking - max distance
-	ERROR(!after_sync && bctello(nut->i) + pd->len - nut->last_syncpoint > nut->max_distance, -ERR_MAX_DISTANCE);
+	ERROR(!after_sync && bctello(nut->i) + pd->len - nut->last_syncpoint > nut->max_distance, -ERR_MAX_SYNCPOINT_DISTANCE);
 	ERROR(!checksum && pd->len > nut->max_distance, -ERR_MAX_DISTANCE);
 	// error checking - max pts distance
 	ERROR(!checksum && ABS((int64_t)pd->pts - (int64_t)nut->sc[pd->stream].last_pts) > nut->sc[pd->stream].max_pts_distance, -ERR_MAX_PTS_DISTANCE);
@@ -1273,6 +1273,7 @@
 		case ERR_BAD_VERSION: return "Bad NUT Version.";
 		case ERR_NOT_FRAME_NOT_N: return "Invalid Framecode.";
 		case ERR_BAD_CHECKSUM: return "Bad Checksum.";
+		case ERR_MAX_SYNCPOINT_DISTANCE: return "max_distance syncpoint";
 		case ERR_MAX_DISTANCE: return "max_distance";
 		case ERR_NO_HEADERS: return "No headers found!";
 		case ERR_NOT_SEEKABLE: return "Cannot seek to that position.";
@@ -1281,6 +1282,7 @@
 		case ERR_BAD_STREAM_ORDER: return "Stream headers are stored in wrong order.";
 		case ERR_NOSTREAM_STARTCODE: return "Expected stream startcode not found.";
 		case ERR_BAD_EOF: return "Invalid forward_ptr!";
+		case ERR_VLC_TOO_LONG: return "VLC too long";
 	}
 	return NULL;
 }

Modified: trunk/libnut/priv.h
==============================================================================
--- trunk/libnut/priv.h (original)
+++ trunk/libnut/priv.h Sat Mar 11 20:04:14 2006
@@ -38,6 +38,7 @@
 	ERR_BAD_VERSION,
 	ERR_NOT_FRAME_NOT_N,
 	ERR_BAD_CHECKSUM,
+	ERR_MAX_SYNCPOINT_DISTANCE,
 	ERR_MAX_DISTANCE,
 	ERR_NO_HEADERS,
 	ERR_NOT_SEEKABLE,