[FFmpeg-cvslog] mxfdec: Ignore the last entry in Avid's index table segments
Tomas Härdin
git at videolan.org
Wed Dec 21 16:03:01 CET 2011
ffmpeg | branch: master | Tomas Härdin <tomas.hardin at codemill.se> | Mon Dec 19 11:00:14 2011 +0100| [085249a37951046ef3e0556e4ccac2390afd9764] | committer: Tomas Härdin
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.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=085249a37951046ef3e0556e4ccac2390afd9764
---
libavformat/mxfdec.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 3a09624..8a5c3c9 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -1072,11 +1072,16 @@ 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 */
- for (j = 0; j < s->nb_index_entries; j += index_delta, x++) {
+ /* ignore the last entry - it's the size of the essence container */
+ n--;
+ }
+
+ for (j = 0; j < n; j += index_delta, x++) {
int offset = s->temporal_offset_entries[j] / index_delta;
int index = x + offset;
More information about the ffmpeg-cvslog
mailing list