diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-13 22:35:57 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-13 22:35:57 +0100 |
| commit | 1f8e1c209db2ec098edd7880a4ac88864615d674 (patch) | |
| tree | 6eb2e8d83545d2a078b8b01fdadfc30af7f1ef59 /libavfilter/vf_hwdownload.c | |
| parent | 7071924cf2308c04a4ae53dd4a2c2070bf031a56 (diff) | |
| parent | c3f113d58488df7594a489bdbb993a69ad47063c (diff) | |
| download | ffmpeg-1f8e1c209db2ec098edd7880a4ac88864615d674.tar.gz | |
Merge commit 'c3f113d58488df7594a489bdbb993a69ad47063c'
* commit 'c3f113d58488df7594a489bdbb993a69ad47063c':
vf_hwdownload: allocate the destination frame for the pool size
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavfilter/vf_hwdownload.c')
| -rw-r--r-- | libavfilter/vf_hwdownload.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavfilter/vf_hwdownload.c b/libavfilter/vf_hwdownload.c index 1e8d81906d..f3138f366a 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; |