Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / mov.c

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 06ea76a5dab4e3d3edecd6ca8f6711b0297a7426..dce2c9152424c7e54a75843ac9a9f91a000c1f9c 100644 (file)
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1753,6 +1753,9 @@ static int mov_read_ctts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
         sc->ctts_data[i].count   = count;
         sc->ctts_data[i].duration= duration;
 
+        av_dlog(c->fc, "count=%d, duration=%d\n",
+                count, duration);
+
         if (FFABS(duration) > (1<<28) && i+2<entries) {
             av_log(c->fc, AV_LOG_WARNING, "CTTS invalid\n");
             av_freep(&sc->ctts_data);
@@ -2532,6 +2535,7 @@ static int mov_read_tref(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 static const MOVParseTableEntry mov_default_parse_table[] = {
 { MKTAG('A','C','L','R'), mov_read_avid },
 { MKTAG('A','P','R','G'), mov_read_avid },
+{ MKTAG('A','A','L','P'), mov_read_avid },
 { MKTAG('A','R','E','S'), mov_read_avid },
 { MKTAG('a','v','s','s'), mov_read_avss },
 { MKTAG('c','h','p','l'), mov_read_chpl },