From 289bc14449bba2ba62d8ede4b22925055670055c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= Date: Thu, 8 Dec 2011 11:06:23 +0100 Subject: [PATCH] mxfdec: Make mxf->partitions sorted by offset This also zeroes new entries for good measure (used by future patches). --- libavformat/mxfdec.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 003796558d..26024ae90a 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -192,6 +192,7 @@ typedef struct { MXFPartition *current_partition; int parsing_backward; int64_t last_forward_tell; + int last_forward_partition; } MXFContext; enum MXFWrappingScheme { @@ -446,7 +447,20 @@ static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size if (!mxf->partitions) return AVERROR(ENOMEM); - partition = mxf->current_partition = &mxf->partitions[mxf->partitions_count++]; + if (mxf->parsing_backward) { + /* insert the new partition pack in the middle + * this makes the entries in mxf->partitions sorted by offset */ + memmove(&mxf->partitions[mxf->last_forward_partition+1], + &mxf->partitions[mxf->last_forward_partition], + (mxf->partitions_count - mxf->last_forward_partition)*sizeof(*mxf->partitions)); + partition = mxf->current_partition = &mxf->partitions[mxf->last_forward_partition]; + } else { + mxf->last_forward_partition++; + partition = mxf->current_partition = &mxf->partitions[mxf->partitions_count]; + } + + memset(partition, 0, sizeof(*partition)); + mxf->partitions_count++; switch(uid[13]) { case 2: