ffmpeg | branch: master | Hendrik Leppkes <h.lepp...@gmail.com> | Sun Nov 13 22:35:57 2016 +0100| [1f8e1c209db2ec098edd7880a4ac88864615d674] | committer: Hendrik Leppkes
Merge commit 'c3f113d58488df7594a489bdbb993a69ad47063c' * commit 'c3f113d58488df7594a489bdbb993a69ad47063c': vf_hwdownload: allocate the destination frame for the pool size Merged-by: Hendrik Leppkes <h.lepp...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f8e1c209db2ec098edd7880a4ac88864615d674 --- libavfilter/vf_hwdownload.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_hwdownload.c b/libavfilter/vf_hwdownload.c index 1e8d819..f3138f3 100644 --- a/libavfilter/vf_hwdownload.c +++ b/libavfilter/vf_hwdownload.c @@ -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; ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
