Mercurial > libavformat.hg

changeset 1732:fc47ca451446 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stop if current sample is higher than sample count
author bcoudurier
date Wed, 24 Jan 2007 15:46:59 +0000
parents d416ac2a3ce4
children 377e4b1a4439
files mov.c
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mov.c	Wed Jan 24 12:49:24 2007 +0000
+++ b/mov.c	Wed Jan 24 15:46:59 2007 +0000
@@ -1494,6 +1494,10 @@
             if (stsc_index + 1 < sc->sample_to_chunk_sz && i + 1 == sc->sample_to_chunk[stsc_index + 1].first)
                 stsc_index++;
             for (j = 0; j < sc->sample_to_chunk[stsc_index].count; j++) {
+                if (current_sample >= sc->sample_count) {
+                    av_log(mov->fc, AV_LOG_ERROR, "wrong sample count\n");
+                    goto out;
+                }
                 keyframe = !sc->keyframe_count || current_sample + 1 == sc->keyframes[stss_index];
                 if (keyframe) {
                     distance = 0;
@@ -1509,8 +1513,7 @@
                 current_dts += sc->stts_data[stts_index].duration / sc->time_rate;
                 distance++;
                 stts_sample++;
-                if (current_sample + 1 < sc->sample_count)
-                    current_sample++;
+                current_sample++;
                 if (stts_index + 1 < sc->stts_count && stts_sample == sc->stts_data[stts_index].count) {
                     stts_sample = 0;
                     stts_index++;
@@ -1578,6 +1581,7 @@
             current_dts += chunk_duration / sc->time_rate;
         }
     }
+ out:
     /* adjust sample count to avindex entries */
     sc->sample_count = st->nb_index_entries;
 }