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 /misc/bstr.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 'misc/bstr.c')
-rw-r--r-- | misc/bstr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/misc/bstr.c b/misc/bstr.c index 09eb6af25b..4117514457 100644 --- a/misc/bstr.c +++ b/misc/bstr.c @@ -34,7 +34,7 @@ int bstrcmp(struct bstr str1, struct bstr str2) { int ret = 0; if (str1.len && str2.len) - ret = memcmp(str1.start, str2.start, FFMIN(str1.len, str2.len)); + ret = memcmp(str1.start, str2.start, MPMIN(str1.len, str2.len)); if (!ret) { if (str1.len == str2.len) @@ -51,7 +51,7 @@ int bstrcasecmp(struct bstr str1, struct bstr str2) { int ret = 0; if (str1.len && str2.len) - ret = strncasecmp(str1.start, str2.start, FFMIN(str1.len, str2.len)); + ret = strncasecmp(str1.start, str2.start, MPMIN(str1.len, str2.len)); if (!ret) { if (str1.len == str2.len) @@ -157,9 +157,9 @@ struct bstr bstr_splice(struct bstr str, int start, int end) start += str.len; if (end < 0) end += str.len; - end = FFMIN(end, str.len); - start = FFMAX(start, 0); - end = FFMAX(end, start); + end = MPMIN(end, str.len); + start = MPMAX(start, 0); + end = MPMAX(end, start); str.start += start; str.len = end - start; return str; @@ -169,7 +169,7 @@ long long bstrtoll(struct bstr str, struct bstr *rest, int base) { str = bstr_lstrip(str); char buf[51]; - int len = FFMIN(str.len, 50); + int len = MPMIN(str.len, 50); memcpy(buf, str.start, len); buf[len] = 0; char *endptr; @@ -183,7 +183,7 @@ double bstrtod(struct bstr str, struct bstr *rest) { str = bstr_lstrip(str); char buf[101]; - int len = FFMIN(str.len, 100); + int len = MPMIN(str.len, 100); memcpy(buf, str.start, len); buf[len] = 0; char *endptr; |