[FFmpeg-cvslog] r23245 - in trunk: Changelog doc/general.texi libavformat/avformat.h libavformat/matroskadec.c

[David Conrad]

On May 22, 2010, at 1:30 PM, Aurelien Jacobs wrote:

> On Sat, May 22, 2010 at 03:41:32AM +0200, conrad wrote:
>> Author: conrad
>> Date: Sat May 22 03:41:32 2010
>> New Revision: 23245
>> 
>> Log:
>> matroskadec: Support webm doctype
>> 
>> Patch by James Zern <jzern at google>
>> 
>> Modified:
>>   trunk/Changelog
>>   trunk/doc/general.texi
>>   trunk/libavformat/avformat.h
>>   trunk/libavformat/matroskadec.c
>> 
>> [...]
>> 
>>                ebml.version, ebml.doctype, ebml.doctype_version);
>> +        ebml_free(ebml_syntax, &ebml);
>> +        return AVERROR_PATCHWELCOME;
>> +    }
>> +    for (i = 0; i < FF_ARRAY_ELEMS(matroska_doctypes); i++)
>> +        if (!strcmp(ebml.doctype, matroska_doctypes[i]))
>> +            break;
>> +    if (i >= FF_ARRAY_ELEMS(matroska_doctypes)) {
>> +        av_log(s, AV_LOG_ERROR, "Unknown EBML doctype '%s'\n", ebml.doctype);
>> +        ebml_free(ebml_syntax, &ebml);
>>         return AVERROR_PATCHWELCOME;
>>     }
> 
>> +    av_metadata_set2(&s->metadata, "doctype", ebml.doctype, 0);
> 
> This was not part of original patch. And this sounds wrong to me.
> doctype is not a metadata. After remuxing, let's say to ogg, having a
> doctype=matroska metadata just makes no sens.
> So I think this line should be removed.

I figured it'd be okay since the mov demuxer does something similar, but I don't care much either way.

Removed