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 /sub/draw_bmp.c | |
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 'sub/draw_bmp.c')
-rw-r--r-- | sub/draw_bmp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sub/draw_bmp.c b/sub/draw_bmp.c index 4125fc3009..a4847b1534 100644 --- a/sub/draw_bmp.c +++ b/sub/draw_bmp.c @@ -22,7 +22,6 @@ #include <inttypes.h> #include <libswscale/swscale.h> -#include <libavutil/common.h> #include "common/common.h" #include "draw_bmp.h" @@ -161,9 +160,9 @@ static void unpremultiply_and_split_BGR32(struct mp_image *img, int div = (int) aval; int add = div / 2; if (aval) { - rval = FFMIN(255, (rval * 255 + add) / div); - gval = FFMIN(255, (gval * 255 + add) / div); - bval = FFMIN(255, (bval * 255 + add) / div); + rval = MPMIN(255, (rval * 255 + add) / div); + gval = MPMIN(255, (gval * 255 + add) / div); + bval = MPMIN(255, (bval * 255 + add) / div); irow[x] = bval + (gval << 8) + (rval << 16) + (aval << 24); } arow[x] = aval; |