diff options
| author | wm4 <wm4@nowhere> | 2019-10-31 11:24:20 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2019-10-31 11:24:20 +0100 |
| commit | 6d92e5550203b04b7254eb8ffe31734e57070d79 (patch) | |
| tree | fcd9f88cddae110a8a65f9e7ea59703bd79f83c5 /video/out/gpu | |
| parent | 6fdfa7c9912ff9fda0ada6125bc4fed61b7220ea (diff) | |
| download | mpv-6d92e5550203b04b7254eb8ffe31734e57070d79.tar.bz2 mpv-6d92e5550203b04b7254eb8ffe31734e57070d79.tar.xz | |
Replace uses of FFMIN/MAX with MPMIN/MAX
And remove libavutil includes where possible.
Diffstat (limited to 'video/out/gpu')
| -rw-r--r-- | video/out/gpu/osd.c | 6 |
1 files changed, 2 insertions, 4 deletions
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 <assert.h> #include <limits.h> -#include <libavutil/common.h> - #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); |