[FFmpeg-devel] [PATCH 3/3] lavf/aiffdec: handle ID3 chunk

Michael Niedermayer michaelni at gmx.at
Sun Jul 1 16:33:50 CEST 2012


On Sun, Jul 01, 2012 at 11:16:43AM +0200, Matthieu Bouron wrote:
> ---
>  libavformat/aiffdec.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
> index 9764f82..bbf93f4 100644
> --- a/libavformat/aiffdec.c
> +++ b/libavformat/aiffdec.c
> @@ -26,6 +26,7 @@
>  #include "pcm.h"
>  #include "aiff.h"
>  #include "isom.h"
> +#include "id3v2.h"
>  
>  #define AIFF                    0
>  #define AIFF_C_VERSION1         0xA2805140
> @@ -195,6 +196,7 @@ static int aiff_read_header(AVFormatContext *s)
>      AVIOContext *pb = s->pb;
>      AVStream * st;
>      AIFFInputContext *aiff = s->priv_data;
> +    ID3v2ExtraMeta *id3v2_extra_meta = NULL;
>  
>      /* check FORM header */
>      filesize = get_tag(pb, &tag);
> @@ -231,6 +233,10 @@ static int aiff_read_header(AVFormatContext *s)
>              if (offset > 0) // COMM is after SSND
>                  goto got_sound;
>              break;
> +        case MKTAG('I', 'D', '3', ' '):
> +            ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta);

> +            av_freep(&id3v2_extra_meta);

why does this not use ff_id3v2_free_extra_meta() ?
it doesnt look correct like that or am i missing something?

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Avoid a single point of failure, be that a person or equipment.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20120701/a8953b1c/attachment.asc>


More information about the ffmpeg-devel mailing list