From c613d802bc5d87a7be031aaf97996d96bd8af909 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 13 Oct 2013 01:16:30 +0200 Subject: talloc: change talloc destructor signature Change talloc destructor so that they can never signal failure, and don't return a status code. This makes our talloc copy even more incompatible to upstream talloc, but on the other hand this is preparation for getting rid of talloc entirely. (The talloc replacement in the next commit won't allow the talloc_free equivalent to fail, and the destructor return value would be useless. But I don't want to change any mpv code either; the idea is that the talloc replacement commit can be reverted for some time in order to test whether the talloc replacement introduced a regression.) --- video/sws_utils.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'video/sws_utils.c') diff --git a/video/sws_utils.c b/video/sws_utils.c index bc9c408b3e..c90efe020c 100644 --- a/video/sws_utils.c +++ b/video/sws_utils.c @@ -150,13 +150,12 @@ static bool cache_valid(struct mp_sws_context *ctx) ctx->saturation == old->saturation; } -static int free_mp_sws(void *p) +static void free_mp_sws(void *p) { struct mp_sws_context *ctx = p; sws_freeContext(ctx->sws); sws_freeFilter(ctx->src_filter); sws_freeFilter(ctx->dst_filter); - return 0; } // You're supposed to set your scaling parameters on the returned context. -- cgit v1.2.3