diff options
| author | Mark Thompson <sw@jkqxz.net> | 2016-06-26 22:35:49 +0100 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2016-11-13 20:39:48 +0000 |
| commit | 1a359e53418ff15b1c9b1e03c05b160f01e1ce0f (patch) | |
| tree | 62bd41157212d136f5e12a4fd038fe0d57e9bb38 | |
| parent | 2dee500f4cbf64c547a37046e95141b84c85ee55 (diff) | |
| download | ffmpeg-1a359e53418ff15b1c9b1e03c05b160f01e1ce0f.tar.gz | |
vf_scale_vaapi: Respect driver quirks around buffer destruction
(cherry picked from commit 582d4211e00015b68626f77ce4af53161e2b1713)
| -rw-r--r-- | libavfilter/vf_scale_vaapi.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libavfilter/vf_scale_vaapi.c b/libavfilter/vf_scale_vaapi.c index 8dd5acfada..d1cb246d1f 100644 --- a/libavfilter/vf_scale_vaapi.c +++ b/libavfilter/vf_scale_vaapi.c @@ -342,13 +342,14 @@ static int scale_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_frame) goto fail_after_render; } - // This doesn't get freed automatically for some reason. - vas = vaDestroyBuffer(ctx->hwctx->display, params_id); - if (vas != VA_STATUS_SUCCESS) { - av_log(ctx, AV_LOG_ERROR, "Failed to free parameter buffer: " - "%d (%s).\n", vas, vaErrorStr(vas)); - err = AVERROR(EIO); - goto fail; + if (ctx->hwctx->driver_quirks & + AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS) { + vas = vaDestroyBuffer(ctx->hwctx->display, params_id); + if (vas != VA_STATUS_SUCCESS) { + av_log(ctx, AV_LOG_ERROR, "Failed to free parameter buffer: " + "%d (%s).\n", vas, vaErrorStr(vas)); + // And ignore. + } } av_frame_copy_props(output_frame, input_frame); |