1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Merge commit 'c3f113d58488df7594a489bdbb993a69ad47063c'

* commit 'c3f113d58488df7594a489bdbb993a69ad47063c':
  vf_hwdownload: allocate the destination frame for the pool size

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2016-11-13 22:35:57 +01:00
commit 1f8e1c209d

View File

@ -142,7 +142,8 @@ static int hwdownload_filter_frame(AVFilterLink *link, AVFrame *input)
goto fail;
}
output = ff_get_video_buffer(outlink, outlink->w, outlink->h);
output = ff_get_video_buffer(outlink, ctx->hwframes->width,
ctx->hwframes->height);
if (!output) {
err = AVERROR(ENOMEM);
goto fail;
@ -154,6 +155,9 @@ static int hwdownload_filter_frame(AVFilterLink *link, AVFrame *input)
goto fail;
}
output->width = outlink->w;
output->height = outlink->h;
err = av_frame_copy_props(output, input);
if (err < 0)
goto fail;