From 6d92e5550203b04b7254eb8ffe31734e57070d79 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
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/bitmap_packer.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'video/out/bitmap_packer.c')

diff --git a/video/out/bitmap_packer.c b/video/out/bitmap_packer.c
index 5169357e3a..4f7739f514 100644
--- a/video/out/bitmap_packer.c
+++ b/video/out/bitmap_packer.c
@@ -116,9 +116,9 @@ static int pack_rectangles(struct pos *in, struct pos *out, int num_rects,
                 if (maxy < 0)
                     stack[stackpos++] = s;
                 s.x = right;
-                maxy = FFMAX(maxy, bottom);
+                maxy = MPMAX(maxy, bottom);
             }
-            *used_width = FFMAX(*used_width, s.x);
+            *used_width = MPMAX(*used_width, s.x);
             if (maxy > 0)
                 s.bottom = maxy;
         }
@@ -144,8 +144,8 @@ int packer_pack(struct bitmap_packer *packer)
             fprintf(stderr, "Invalid OSD / subtitle bitmap size\n");
             abort();
         }
-        xmax = FFMAX(xmax, in[i].x);
-        ymax = FFMAX(ymax, in[i].y);
+        xmax = MPMAX(xmax, in[i].x);
+        ymax = MPMAX(ymax, in[i].y);
     }
     if (xmax > packer->w)
         packer->w = 1 << (av_log2(xmax - 1) + 1);
@@ -157,8 +157,8 @@ int packer_pack(struct bitmap_packer *packer)
                                 packer->w, packer->h,
                                 packer->scratch, &used_width);
         if (y >= 0) {
-            packer->used_width = FFMIN(used_width, packer->w);
-            packer->used_height = FFMIN(y, packer->h);
+            packer->used_width = MPMIN(used_width, packer->w);
+            packer->used_height = MPMIN(y, packer->h);
             assert(packer->w == 0 || IS_POWER_OF_2(packer->w));
             assert(packer->h == 0 || IS_POWER_OF_2(packer->h));
             if (packer->padding) {
@@ -172,9 +172,9 @@ int packer_pack(struct bitmap_packer *packer)
         int w_max = packer->w_max > 0 ? packer->w_max : INT_MAX;
         int h_max = packer->h_max > 0 ? packer->h_max : INT_MAX;
         if (packer->w <= packer->h && packer->w != w_max)
-            packer->w = FFMIN(packer->w * 2, w_max);
+            packer->w = MPMIN(packer->w * 2, w_max);
         else if (packer->h != h_max)
-            packer->h = FFMIN(packer->h * 2, h_max);
+            packer->h = MPMIN(packer->h * 2, h_max);
         else {
             packer->w = w_orig;
             packer->h = h_orig;
@@ -188,7 +188,7 @@ void packer_set_size(struct bitmap_packer *packer, int size)
     packer->count = size;
     if (size <= packer->asize)
         return;
-    packer->asize = FFMAX(packer->asize * 2, size);
+    packer->asize = MPMAX(packer->asize * 2, size);
     talloc_free(packer->result);
     talloc_free(packer->scratch);
     packer->in = talloc_realloc(packer, packer->in, struct pos, packer->asize);
-- 
cgit v1.2.3