har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/wrapped_avframe: allocate a buffer with padding

Browse Source 
This ensures that the wrapped avframe will not get reallocated later, which
would invalidate internal references such as extended data.

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2017-02-21 23:50:56 +01:00
parent 039011b6b0
commit 436f00b10c
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/wrapped_avframe.c
View File

@ -43,19 +43,31 @@ static int wrapped_avframe_encode(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *frame, int *got_packet) const AVFrame *frame, int *got_packet)
{ {
AVFrame *wrapped = av_frame_clone(frame); AVFrame *wrapped = av_frame_clone(frame);
uint8_t *data;
int size = sizeof(*wrapped) + AV_INPUT_BUFFER_PADDING_SIZE;
if (!wrapped) if (!wrapped)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
pkt->buf = av_buffer_create((uint8_t *)wrapped, sizeof(*wrapped), data = av_mallocz(size);
wrapped_avframe_release_buffer, NULL, if (!data) {
AV_BUFFER_FLAG_READONLY);
if (!pkt->buf) {
av_frame_free(&wrapped); av_frame_free(&wrapped);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
pkt->data = (uint8_t *)wrapped; 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);
}
av_frame_move_ref((AVFrame*)data, wrapped);
av_frame_free(&wrapped);
pkt->data = data;
pkt->size = sizeof(*wrapped); pkt->size = sizeof(*wrapped);
pkt->flags |= AV_PKT_FLAG_KEY; pkt->flags |= AV_PKT_FLAG_KEY;