summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2019-10-31 11:24:20 +0100
committerwm4 <wm4@nowhere>2019-10-31 11:24:20 +0100
commit6d92e5550203b04b7254eb8ffe31734e57070d79 (patch)
treefcd9f88cddae110a8a65f9e7ea59703bd79f83c5 /options
parent6fdfa7c9912ff9fda0ada6125bc4fed61b7220ea (diff)
downloadmpv-6d92e5550203b04b7254eb8ffe31734e57070d79.tar.bz2
mpv-6d92e5550203b04b7254eb8ffe31734e57070d79.tar.xz
Replace uses of FFMIN/MAX with MPMIN/MAX
And remove libavutil includes where possible.
Diffstat (limited to 'options')
-rw-r--r--options/m_option.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/options/m_option.c b/options/m_option.c
index 5df8b00291..d69d19fa08 100644
--- a/options/m_option.c
+++ b/options/m_option.c
@@ -31,7 +31,6 @@
#include <assert.h>
#include <libavutil/common.h>
-#include <libavutil/avstring.h>
#include "libmpv/client.h"
#include "player/client.h"
@@ -611,12 +610,12 @@ static void choice_get_min_max(const struct m_option *opt, int *min, int *max)
*min = INT_MAX;
*max = INT_MIN;
for (struct m_opt_choice_alternatives *alt = opt->priv; alt->name; alt++) {
- *min = FFMIN(*min, alt->value);
- *max = FFMAX(*max, alt->value);
+ *min = MPMIN(*min, alt->value);
+ *max = MPMAX(*max, alt->value);
}
if ((opt->flags & M_OPT_MIN) && (opt->flags & M_OPT_MAX)) {
- *min = FFMIN(*min, opt->min);
- *max = FFMAX(*max, opt->max);
+ *min = MPMIN(*min, opt->min);
+ *max = MPMAX(*max, opt->max);
}
}