From 6d92e5550203b04b7254eb8ffe31734e57070d79 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 31 Oct 2019 11:24:20 +0100 Subject: Replace uses of FFMIN/MAX with MPMIN/MAX And remove libavutil includes where possible. --- video/out/gpu/osd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'video/out/gpu') diff --git a/video/out/gpu/osd.c b/video/out/gpu/osd.c index 3ab11fcb2b..63a04481d2 100644 --- a/video/out/gpu/osd.c +++ b/video/out/gpu/osd.c @@ -19,8 +19,6 @@ #include #include -#include - #include "common/common.h" #include "common/msg.h" #include "video/csputils.h" @@ -140,8 +138,8 @@ static bool upload_osd(struct mpgl_osd *ctx, struct mpgl_osd_part *osd, ra_tex_free(ra, &osd->texture); osd->format = imgs->format; - osd->w = FFMAX(32, req_w); - osd->h = FFMAX(32, req_h); + osd->w = MPMAX(32, req_w); + osd->h = MPMAX(32, req_h); MP_VERBOSE(ctx, "Reallocating OSD texture to %dx%d.\n", osd->w, osd->h); -- cgit v1.2.3