Author: rolf
Date: 2008-02-06 16:42:25 -0500 (Wed, 06 Feb 2008)
New Revision: 95081
Modified:
trunk/moon/src/asf/ChangeLog
trunk/moon/src/asf/asf.cpp
Log:
* asf.cpp: Fix MIN/MAX confusion.
Modified: trunk/moon/src/asf/ChangeLog
===================================================================
--- trunk/moon/src/asf/ChangeLog 2008-02-06 21:42:20 UTC (rev 95080)
+++ trunk/moon/src/asf/ChangeLog 2008-02-06 21:42:25 UTC (rev 95081)
@@ -1,3 +1,7 @@
+2008-02-06 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
+
+ * asf.cpp: Fix MIN/MAX confusion.
+
2008-02-04 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
* asf.cpp: Don't create an index if we have a media with 0 packets.
Modified: trunk/moon/src/asf/asf.cpp
===================================================================
--- trunk/moon/src/asf/asf.cpp 2008-02-06 21:42:20 UTC (rev 95080)
+++ trunk/moon/src/asf/asf.cpp 2008-02-06 21:42:25 UTC (rev 95081)
@@ -1205,7 +1205,7 @@
}
result = MAX (0, result);
- result = MIN (result, MIN (0, parser->GetPacketCount () - 1));
+ result = MIN (result, MAX (0, parser->GetPacketCount () - 1));
//printf ("ASFFrameReader::GetPacketIndexOfPts (%llu, %p): Final
position: %lld of pi: %i. Total packets: %llu, total duration: %llu\n", pts,
estimate, parser->GetPacketOffset (pi), pi, parser->GetFileProperties
()->data_packet_count, parser->GetFileProperties ()->play_duration);
return result;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
