diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-05-17 00:29:52 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-06-22 23:39:17 -0300 |
| commit | 07d4056052081b0157cf529dc2708834f8df9885 (patch) | |
| tree | a18bc810388866270c01fa56baeb3c531fbdd358 | |
| parent | 1beeb3b877d00385c80b1750b45fa4f5e2d96301 (diff) | |
avformat/matroskadec: Don't copy attached pictures
This commit replaces copying attached pictures by using references to
the already existing buffers.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavformat/matroskadec.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 3b8ddc5ecb..7ae73fda35 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2715,15 +2715,19 @@ static int matroska_read_header(AVFormatContext *s) attachments[j].stream = st; if (st->codecpar->codec_id != AV_CODEC_ID_NONE) { + AVPacket *pkt = &st->attached_pic; + st->disposition |= AV_DISPOSITION_ATTACHED_PIC; st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; - av_init_packet(&st->attached_pic); - if ((res = av_new_packet(&st->attached_pic, attachments[j].bin.size)) < 0) - return res; - memcpy(st->attached_pic.data, attachments[j].bin.data, attachments[j].bin.size); - st->attached_pic.stream_index = st->index; - st->attached_pic.flags |= AV_PKT_FLAG_KEY; + av_init_packet(pkt); + pkt->buf = av_buffer_ref(attachments[j].bin.buf); + if (!pkt->buf) + return AVERROR(ENOMEM); + pkt->data = attachments[j].bin.data; + pkt->size = attachments[j].bin.size; + pkt->stream_index = st->index; + pkt->flags |= AV_PKT_FLAG_KEY; } else { st->codecpar->codec_type = AVMEDIA_TYPE_ATTACHMENT; if (ff_alloc_extradata(st->codecpar, attachments[j].bin.size)) |