[SCM] libav/experimental: mov: Read Flash's chpl variant

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 105b37859b97115cb686b291e93c5a588969b2d9
Author: David Conrad <lessen42 at gmail.com>
Date:   Sun Jul 4 04:59:12 2010 +0000

    mov: Read Flash's chpl variant
    
    This is based off of F4V specs rather than any actual files
    
    Originally committed as revision 24035 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index dfed5dc..fb2353c 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -222,14 +222,16 @@ static int mov_read_udta_string(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
 static int mov_read_chpl(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
 {
     int64_t start;
-    int i, nb_chapters, str_len;
+    int i, nb_chapters, str_len, version;
     char str[256+1];
 
     if ((atom.size -= 5) < 0)
         return 0;
 
-    get_be32(pb); // version + flags
-    get_be32(pb); // ???
+    version = get_byte(pb);
+    get_be24(pb);
+    if (version)
+        get_be32(pb); // ???
     nb_chapters = get_byte(pb);
 
     for (i = 0; i < nb_chapters; i++) {

-- 
Libav/FFmpeg packaging