From: Philip de Nier <philip.denier@rd.bbc.co.uk>
Date: Mon, 12 Sep 2011 10:13:44 +0000 (+0100)
Subject: mxfdec: skip to end of structural sets
X-Git-Tag: v9_beta1~3443
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0662eea6b0b6a94753ed2fda813de1c3d8692fd8;p=platform%2Fupstream%2Flibav.git

mxfdec: skip to end of structural sets

This fixes reading of partition packs. The code stops reading after the
operational pattern and should skip the array of essence container
labels that follow.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
---

diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 33c931e..38e98a3 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -1053,8 +1053,11 @@ static int mxf_read_header(AVFormatContext *s, AVFormatParameters *ap)
                 int res;
                 if (klv.key[5] == 0x53) {
                     res = mxf_read_local_tags(mxf, &klv, metadata->read, metadata->ctx_size, metadata->type);
-                } else
+                } else {
+                    uint64_t next = avio_tell(s->pb) + klv.length;
                     res = metadata->read(mxf, s->pb, 0, 0, klv.key);
+                    avio_seek(s->pb, next, SEEK_SET);
+                }
                 if (res < 0) {
                     av_log(s, AV_LOG_ERROR, "error reading header metadata\n");
                     return res;