[FFmpeg-cvslog] libavformat/mov.c: Skipped duplicated MOOV atom

[Thierry Foucu]

ffmpeg | branch: master | Thierry Foucu <tfoucu at gmail.com> | Thu Jul 11 14:37:59 2013 -0700| [38ce775eead70b84272ee4ba908b6db3516e7cbd] | committer: 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: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=38ce775eead70b84272ee4ba908b6db3516e7cbd
---

 libavformat/mov.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 9c6ad99..a9ca1c4 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' */