summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2006-06-18 19:41:39 +0000
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2006-06-18 19:41:39 +0000
commit9f33348b9b0691317ccffde6954edf2f8aeebc70 (patch)
tree9c00b723a68cbc06d9446013267165f34a378fcd /src
parent9e3275c389cce43de2d5505a35eb0b3b8bb02c3f (diff)
downloadxine-lib-9f33348b9b0691317ccffde6954edf2f8aeebc70.tar.gz
xine-lib-9f33348b9b0691317ccffde6954edf2f8aeebc70.tar.bz2
Remove infinite loop condition that could have created an invalid access if no keyframe was found.
CVS patchset: 8053 CVS date: 2006/06/18 19:41:39
Diffstat (limited to 'src')
-rw-r--r--src/demuxers/demux_avi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index 027fe333d..00c36dec9 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -19,7 +19,7 @@
*/
/*
- * $Id: demux_avi.c,v 1.226 2006/06/02 22:18:56 dsalt Exp $
+ * $Id: demux_avi.c,v 1.227 2006/06/18 19:41:39 dgp85 Exp $
*
* demultiplexer for avi streams
*
@@ -468,7 +468,7 @@ static int audio_pos_stopper(demux_avi_t *this, void *data) {
* is in the index. */
static int start_pos_stopper(demux_avi_t *this, void *data) {
off_t start_pos = *(off_t *)data;
- uint32_t maxframe = this->avi->video_idx.video_frames - 1;
+ int32_t maxframe = this->avi->video_idx.video_frames - 1;
while( maxframe >= 0 && this->avi->video_idx.vindex[maxframe].pos >= start_pos ) {
if ( this->avi->video_idx.vindex[maxframe].flags & AVIIF_KEYFRAME )
@@ -482,7 +482,7 @@ static int start_pos_stopper(demux_avi_t *this, void *data) {
* is in the index. */
static int start_time_stopper(demux_avi_t *this, void *data) {
int64_t video_pts = *(int64_t *)data;
- uint32_t maxframe = this->avi->video_idx.video_frames - 1;
+ int32_t maxframe = this->avi->video_idx.video_frames - 1;
while( maxframe >= 0 && get_video_pts(this,maxframe) >= video_pts ) {
if ( this->avi->video_idx.vindex[maxframe].flags & AVIIF_KEYFRAME )