[NUT-devel] [NUT] (ods15): r107 - /trunk/libnut/demuxer.c

[syncmail at mplayerhq.hu]

Author: ods15
Date: Thu Mar 16 07:40:02 2006
New Revision: 107

Log:
The most annoying bug i ever had to hunt down
and a small EAGAIN fix

Modified:
    trunk/libnut/demuxer.c

Modified: trunk/libnut/demuxer.c
==============================================================================
--- trunk/libnut/demuxer.c (original)
+++ trunk/libnut/demuxer.c Thu Mar 16 07:40:02 2006
@@ -1053,7 +1053,7 @@
 					break;
 				}
 			}
-		} else if (stopper && pd.flags&NUT_FLAG_KEY && !(good_key[i]&1)) {
+		} else if (stopper && pd.flags&NUT_FLAG_KEY && !(good_key[pd.stream]&1)) {
 			TO_PTS(stopper, stopper->pts)
 			if (compare_ts(nut, stopper_p, nut->tb[stopper_t], pd.pts, TO_TB(pd.stream)) > 0) {
 				good_key[pd.stream] = buf_before<<1;
@@ -1067,11 +1067,11 @@
 				}
 			}
 		}
-		push_frame(nut, &pd);
 		// dts higher than requested pts
 		if (end && nut->sc[pd.stream].last_dts != -1 && nut->sc[pd.stream].last_dts > pts[pd.stream]>>1) break;
 
 		CHECK(skip_buffer(nut->i, pd.len));
+		push_frame(nut, &pd);
 	}
 	if (!end) goto err_out; // forward seek