Commit 38ce775e authored by Thierry Foucu's avatar Thierry Foucu Committed by Michael Niedermayer

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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 0fff7f03
...@@ -785,6 +785,12 @@ static int mov_read_moov(MOVContext *c, AVIOContext *pb, MOVAtom atom) ...@@ -785,6 +785,12 @@ static int mov_read_moov(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{ {
int ret; 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) if ((ret = mov_read_default(c, pb, atom)) < 0)
return ret; return ret;
/* we parsed the 'moov' atom, we can terminate the parsing as soon as we find the 'mdat' */ /* we parsed the 'moov' atom, we can terminate the parsing as soon as we find the 'mdat' */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment