Module: libav Branch: release/12 Commit: 98db2e3a3b3023b02ef6aa4160a288bebcdc1570
Author: Mark Thompson <[email protected]> Committer: Mark Thompson <[email protected]> Date: Fri Nov 25 12:36:05 2016 +0000 hwcontext_vaapi: Don't abort on failing to allocate from a fixed-size pool (cherry picked from commit d30719e62de68975cbc7ffd318df03a183037563) --- libavutil/hwcontext_vaapi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index bba0c4d..e13c0de 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -390,6 +390,10 @@ static AVBufferRef *vaapi_pool_alloc(void *opaque, int size) VAStatus vas; AVBufferRef *ref; + if (hwfc->initial_pool_size > 0 && + avfc->nb_surfaces >= hwfc->initial_pool_size) + return NULL; + vas = vaCreateSurfaces(hwctx->display, ctx->rt_format, hwfc->width, hwfc->height, &surface_id, 1, _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
