Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace uses of FFMIN/MAX with MPMIN/MAX

Browse Source 
And remove libavutil includes where possible.
This commit is contained in:
wm4
2019-10-31 11:24:20 +01:00
parent 6fdfa7c991
commit 6d92e55502
16 changed files with 66 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
options/m_option.c
View File

@@ -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);
}
}