Commit 8d617b11 authored by Anton Khirnov's avatar Anton Khirnov

id3v2: pad the APIC packets as required by lavc.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
parent 3623589e
...@@ -476,9 +476,10 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, char *tag ...@@ -476,9 +476,10 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, char *tag
goto fail; goto fail;
} }
apic->buf = av_buffer_alloc(taglen); apic->buf = av_buffer_alloc(taglen + FF_INPUT_BUFFER_PADDING_SIZE);
if (!apic->buf || avio_read(pb, apic->buf->data, taglen) != taglen) if (!apic->buf || avio_read(pb, apic->buf->data, taglen) != taglen)
goto fail; goto fail;
memset(apic->buf->data + taglen, 0, FF_INPUT_BUFFER_PADDING_SIZE);
new_extra->tag = "APIC"; new_extra->tag = "APIC";
new_extra->data = apic; new_extra->data = apic;
...@@ -735,7 +736,7 @@ int ff_id3v2_parse_apic(AVFormatContext *s, ID3v2ExtraMeta **extra_meta) ...@@ -735,7 +736,7 @@ int ff_id3v2_parse_apic(AVFormatContext *s, ID3v2ExtraMeta **extra_meta)
av_init_packet(&st->attached_pic); av_init_packet(&st->attached_pic);
st->attached_pic.buf = apic->buf; st->attached_pic.buf = apic->buf;
st->attached_pic.data = apic->buf->data; st->attached_pic.data = apic->buf->data;
st->attached_pic.size = apic->buf->size; st->attached_pic.size = apic->buf->size - FF_INPUT_BUFFER_PADDING_SIZE;
st->attached_pic.stream_index = st->index; st->attached_pic.stream_index = st->index;
st->attached_pic.flags |= AV_PKT_FLAG_KEY; st->attached_pic.flags |= AV_PKT_FLAG_KEY;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment