diff options
| author | Matthieu Bouron <matthieu.bouron@gmail.com> | 2017-03-29 23:31:20 +0200 |
|---|---|---|
| committer | Matthieu Bouron <matthieu.bouron@gmail.com> | 2017-03-29 23:33:20 +0200 |
| commit | 78e871ebbcc6f3c877e7292c4dda0c9979f8ede4 (patch) | |
| tree | dde035107feb68839a074828a4c9f4c36e27fa3d /libavfilter/vf_scale_qsv.c | |
| parent | b4016ef31a6ea007e481427ade35ac35d1519170 (diff) | |
| parent | 7e2561fa8313982aa21f7657953eedeeb33b210d (diff) | |
| download | ffmpeg-78e871ebbcc6f3c877e7292c4dda0c9979f8ede4.tar.gz | |
Merge commit '7e2561fa8313982aa21f7657953eedeeb33b210d'
* commit '7e2561fa8313982aa21f7657953eedeeb33b210d':
lavfi: Use ff_get_video_buffer in all filters using hwframes
vf_hwupload_cuda: Fix build error
Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Diffstat (limited to 'libavfilter/vf_scale_qsv.c')
| -rw-r--r-- | libavfilter/vf_scale_qsv.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavfilter/vf_scale_qsv.c b/libavfilter/vf_scale_qsv.c index 88fca8b461..52e3ef9c95 100644 --- a/libavfilter/vf_scale_qsv.c +++ b/libavfilter/vf_scale_qsv.c @@ -530,16 +530,12 @@ static int qsvscale_filter_frame(AVFilterLink *link, AVFrame *in) AVFrame *out = NULL; int ret = 0; - out = av_frame_alloc(); + out = ff_get_video_buffer(outlink, outlink->w, outlink->h); if (!out) { ret = AVERROR(ENOMEM); goto fail; } - ret = av_hwframe_get_buffer(s->out_frames_ref, out, 0); - if (ret < 0) - goto fail; - do { err = MFXVideoVPP_RunFrameVPPAsync(s->session, (mfxFrameSurface1*)in->data[3], |