[FFmpeg-devel] [PATCH] ADTS AAC with ID3v2

[David DeHaven]

On Jan 23, 2009, at 12:23 PM, Michael Niedermayer wrote:
> On Fri, Jan 23, 2009 at 09:54:24AM -0800, David DeHaven wrote:
>>>> +    if(ff_id3v2_match(bufptr))
>>>> +        bptr += ff_id3v2_tag_len(bufptr);
>>>>
>>> how did you get the compiler past bptr?
>>
>> Gah! I did it again...
>>
>> Ok, this time I TRIPLE checked the attachment was the right one :)
>
> what attachment ?
>
> just kidding ;)

 >:P


> [...]
>> Index: libavformat/raw.c
>> ===================================================================
>> --- libavformat/raw.c	(revision 16729)
>> +++ libavformat/raw.c	(working copy)
>> @@ -289,6 +289,19 @@
>>     st->codec->codec_id = s->iformat->value;
>>     st->need_parsing = AVSTREAM_PARSE_FULL;
>>     /* the parameters will be extracted from the compressed  
>> bitstream */
>> +
>
> trailing whitespace

Missed that, fixed.


>> +    if(st->codec->codec_id == CODEC_ID_FLAC) {
>> +        /* skip ID3v2 header if found */
>> +        uint8_t buf[ID3v2_HEADER_SIZE];
>> +        int ret = get_buffer(s->pb, buf, ID3v2_HEADER_SIZE);
>> +        if ((ret == ID3v2_HEADER_SIZE) && ff_id3v2_match(buf)) {
>
> superflous ()

Removed. Old habit from other using compilers that didn't always get  
evaluation order right...


> but i think the patch is ok except these now :)

Hopefully final patch attached.

-DrD-
-------------- next part --------------
A non-text attachment was scrubbed...
Name: flac_id3.patch
Type: application/octet-stream
Size: 1255 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20090123/722ae7de/attachment.obj>
-------------- next part --------------