aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Conrad <lessen42@gmail.com>2010-07-04 04:59:12 +0000
committerDavid Conrad <lessen42@gmail.com>2010-07-04 04:59:12 +0000
commit105b37859b97115cb686b291e93c5a588969b2d9 (patch)
tree433f4444fee206ce210b9ba8456665632aaaa28d
parent3c5e1b36d5ce0d75e1b63fafab93e8efeb6a6fcd (diff)
downloadffmpeg-105b37859b97115cb686b291e93c5a588969b2d9.tar.gz
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
-rw-r--r--libavformat/mov.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index dfed5dc61c..fb2353c0d5 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++) {