Merge commit 'e92123093dfdca0ef6608998240e2f9345d63bff'

[ffmpeg] / libavformat / apetag.c

diff --git a/libavformat/apetag.c b/libavformat/apetag.c
index a376a0bc4a4db1db8b46005d1615d13a7f1a5a45..6e59bc7de188ba59972dc4c50ccf37a0149ef05f 100644 (file)
--- a/libavformat/apetag.c
+++ b/libavformat/apetag.c
@@ -88,13 +88,8 @@ static int ape_tag_read_field(AVFormatContext *s)
             st->attached_pic.stream_index = st->index;
             st->attached_pic.flags       |= AV_PKT_FLAG_KEY;
         } else {
-            if (ff_alloc_extradata(st->codec, size))
+            if (ff_get_extradata(st->codec, s->pb, size) < 0)
                 return AVERROR(ENOMEM);
-            if (avio_read(pb, st->codec->extradata, size) != size) {
-                av_freep(&st->codec->extradata);
-                st->codec->extradata_size = 0;
-                return AVERROR(EIO);
-            }
             st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT;
         }
     } else {