[FFmpeg-devel] [PATCH] mov: Read Flash's chpl variant

[David Conrad]

On Jul 3, 2010, at 10:09 PM, Baptiste Coudurier wrote:

> On 7/3/10 6:32 PM, David Conrad wrote:
>> This is based off of F4V specs rather than any actual files
>> ---
>>  libavformat/mov.c |    8 +++++---
>>  1 files changed, 5 insertions(+), 3 deletions(-)
>> 
>> 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++) {
> 
> Patch ok, and good job nero ....

Applied