[FFmpeg-cvslog] r17193 - trunk/libavformat/adtsenc.c

[Robert Swain]

2009/2/13 Alex Converse <alex.converse at gmail.com>:
> On Thu, Feb 12, 2009 at 6:51 PM, superdump <subversion at mplayerhq.hu> wrote:
>> Author: superdump
>> Date: Fri Feb 13 00:51:08 2009
>> New Revision: 17193
>>
>> Log:
>> ADTS Muxer: Refuse to write illegal ADTS files by checking validity of header
>> members and erroring out if invalid
>>
>> Patch by Alex Converse ( alex converse gmail com )
>>
>> Modified:
>>   trunk/libavformat/adtsenc.c
>>
>> Modified: trunk/libavformat/adtsenc.c
>> ==============================================================================
>> --- trunk/libavformat/adtsenc.c Fri Feb 13 00:48:07 2009        (r17192)
>> +++ trunk/libavformat/adtsenc.c Fri Feb 13 00:51:08 2009        (r17193)
>> @@ -32,7 +32,7 @@ typedef struct {
>>     int channel_conf;
>>  } ADTSContext;
>>
>> -static int decode_extradata(ADTSContext *adts, uint8_t *buf, int size)
>> +static int decode_extradata(AVFormatContext *s, ADTSContext *adts, uint8_t *buf, int size)
>>  {
>>     GetBitContext gb;
>>
>> @@ -41,6 +41,19 @@ static int decode_extradata(ADTSContext
>>     adts->sample_rate_index = get_bits(&gb, 4);
>>     adts->channel_conf = get_bits(&gb, 4);
>>
>> +    if (adts->objecttype > 3) {
>> +        av_log(s, AV_LOG_ERROR, "MPEG-4 AOT %d is not allowed in ADTS\n", adts->objecttype);
>> +        return -1;
>> +    }
>
> Sorry to bother you again, I should have caught this the first time
> but when printing the error we refer to MPEG-4 AOTs so we should use
> the MPEG-4 numbers not the ADTS numbers or the text should be revised.

OK.

Regards,
Rob