[FFmpeg-devel] [PATCH 06/18] avformat/apetag: Avoid stack packet when reading attached picture

[Andreas Rheinhardt]

Andreas Rheinhardt:
> Read it directly into AVStream.attached_pic.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> ---
>  libavformat/apetag.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/libavformat/apetag.c b/libavformat/apetag.c
> index 454c6c688b..23ee6b516d 100644
> --- a/libavformat/apetag.c
> +++ b/libavformat/apetag.c
> @@ -79,10 +79,9 @@ static int ape_tag_read_field(AVFormatContext *s)
>          av_dict_set(&st->metadata, key, filename, 0);
>  
>          if ((id = ff_guess_image2_codec(filename)) != AV_CODEC_ID_NONE) {
> -            AVPacket pkt;
>              int ret;
>  
> -            ret = av_get_packet(s->pb, &pkt, size);
> +            ret = av_get_packet(s->pb, &st->attached_pic, size);
>              if (ret < 0) {
>                  av_log(s, AV_LOG_ERROR, "Error reading cover art.\n");
>                  return ret;
> @@ -92,7 +91,6 @@ static int ape_tag_read_field(AVFormatContext *s)
>              st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
>              st->codecpar->codec_id   = id;
>  
> -            st->attached_pic              = pkt;
>              st->attached_pic.stream_index = st->index;
>              st->attached_pic.flags       |= AV_PKT_FLAG_KEY;
>          } else {
> 
Will apply.

- Andreas