From 38ce775eead70b84272ee4ba908b6db3516e7cbd Mon Sep 17 00:00:00 2001 From: Thierry Foucu Date: Thu, 11 Jul 2013 14:37:59 -0700 Subject: [PATCH] libavformat/mov.c: Skipped duplicated MOOV atom This should fix ticket 1378 If we have parsed a moov atom, and found another one, just skip it. Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 9c6ad99d90..a9ca1c4bf7 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -785,6 +785,12 @@ static int mov_read_moov(MOVContext *c, AVIOContext *pb, MOVAtom atom) { int ret; + if (c->found_moov) { + av_log(c->fc, AV_LOG_WARNING, "Found duplicated MOOV Atom. Skipped it\n"); + avio_skip(pb, atom.size); + return 0; + } + if ((ret = mov_read_default(c, pb, atom)) < 0) return ret; /* we parsed the 'moov' atom, we can terminate the parsing as soon as we find the 'mdat' */ -- 2.11.0