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

[ods15]

Author: ods15
Date: Fri Nov 17 08:38:49 2006
New Revision: 220

Modified:
   trunk/libnut/demuxer.c

Log:
some fixes in mid-stream info packets


Modified: trunk/libnut/demuxer.c
==============================================================================
--- trunk/libnut/demuxer.c	(original)
+++ trunk/libnut/demuxer.c	Fri Nov 17 08:38:49 2006
@@ -674,7 +674,7 @@
 			case INFO_STARTCODE: if (nut->dopts.new_info && !nut->seek_status) {
 				CHECK(get_info_header(nut, &info));
 				nut->dopts.new_info(nut->dopts.priv, &info);
-				break;
+				return -1;
 			} // else - fall through!
 			default:
 				CHECK(get_header(nut->i, NULL));
@@ -860,7 +860,7 @@
 		nut->seek_status = 0;
 	}
 
-	while ((err = get_packet(nut, pd, NULL)) == -1);
+	while ((err = get_packet(nut, pd, NULL)) == -1) flush_buf(nut->i);
 	if (err > NUT_ERR_EAGAIN) { // some error occured!
 		fprintf(stderr, "NUT: %s\n", nut_error(err));
 		// rewind as much as possible