Commit 436f00b1 authored by Marton Balint's avatar Marton Balint

avcodec/wrapped_avframe: allocate a buffer with padding

This ensures that the wrapped avframe will not get reallocated later, which
would invalidate internal references such as extended data.
Reviewed-by: 's avatarwm4 <nfxjfg@googlemail.com>
Signed-off-by: 's avatarMarton Balint <cus@passwd.hu>
parent 039011b6
......@@ -43,19 +43,31 @@ static int wrapped_avframe_encode(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *frame, int *got_packet)
{
AVFrame *wrapped = av_frame_clone(frame);
uint8_t *data;
int size = sizeof(*wrapped) + AV_INPUT_BUFFER_PADDING_SIZE;
if (!wrapped)
return AVERROR(ENOMEM);
pkt->buf = av_buffer_create((uint8_t *)wrapped, sizeof(*wrapped),
data = av_mallocz(size);
if (!data) {
av_frame_free(&wrapped);
return AVERROR(ENOMEM);
}
pkt->buf = av_buffer_create(data, size,
wrapped_avframe_release_buffer, NULL,
AV_BUFFER_FLAG_READONLY);
if (!pkt->buf) {
av_frame_free(&wrapped);
av_freep(&data);
return AVERROR(ENOMEM);
}
pkt->data = (uint8_t *)wrapped;
av_frame_move_ref((AVFrame*)data, wrapped);
av_frame_free(&wrapped);
pkt->data = data;
pkt->size = sizeof(*wrapped);
pkt->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