From: Tomas Härdin <tomas.hardin@codemill.se>
Date: Thu, 26 Jan 2012 12:21:30 +0000 (+0100)
Subject: mxfdec: Ignore the last entry in Avid's index table segments
X-Git-Tag: android-x86-4.4-r1~8529^2~3314
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e24167aae6c6ce2839537356077faac5602694bc;p=android-x86%2Fexternal-ffmpeg.git

mxfdec: Ignore the last entry in Avid's index table segments

The last entry is the total size of the essence container.
Previously a TemporalOffset error would be logged, even though
segments like these are expected.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
---

diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 50c40c9182..dd102408db 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -1131,11 +1131,15 @@ static int mxf_compute_ptses_fake_index(MXFContext *mxf, MXFIndexTable *index_ta
     for (i = x = 0; i < index_table->nb_segments; i++) {
         MXFIndexTableSegment *s = index_table->segments[i];
         int index_delta = 1;
+        int n = s->nb_index_entries;
 
-        if (s->nb_index_entries == 2 * s->index_duration + 1)
+        if (s->nb_index_entries == 2 * s->index_duration + 1) {
             index_delta = 2;    /* Avid index */
+            /* ignore the last entry - it's the size of the essence container */
+            n--;
+        }
 
-        for (j = 0; j < s->nb_index_entries; j += index_delta, x++) {
+        for (j = 0; j < n; j += index_delta, x++) {
             int offset = s->temporal_offset_entries[j] / index_delta;
             int index  = x + offset;