diff options
Diffstat (limited to 'misc')
-rw-r--r-- | misc/bstr.c | 14 | ||||
-rw-r--r-- | misc/ring.c | 11 |
2 files changed, 13 insertions, 12 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; diff --git a/misc/ring.c b/misc/ring.c index 58918a40a4..eb3c420cfc 100644 --- a/misc/ring.c +++ b/misc/ring.c @@ -18,8 +18,9 @@ */ #include <inttypes.h> -#include <libavutil/common.h> #include <assert.h> + +#include "common/common.h" #include "mpv_talloc.h" #include "osdep/atomic.h" #include "ring.h" @@ -59,10 +60,10 @@ int mp_ring_read(struct mp_ring *buffer, unsigned char *dest, int len) { int size = mp_ring_size(buffer); int buffered = mp_ring_buffered(buffer); - int read_len = FFMIN(len, buffered); + int read_len = MPMIN(len, buffered); int read_ptr = mp_ring_get_rpos(buffer) % size; - int len1 = FFMIN(size - read_ptr, read_len); + int len1 = MPMIN(size - read_ptr, read_len); int len2 = read_len - len1; if (dest) { @@ -84,10 +85,10 @@ int mp_ring_write(struct mp_ring *buffer, unsigned char *src, int len) { int size = mp_ring_size(buffer); int free = mp_ring_available(buffer); - int write_len = FFMIN(len, free); + int write_len = MPMIN(len, free); int write_ptr = mp_ring_get_wpos(buffer) % size; - int len1 = FFMIN(size - write_ptr, write_len); + int len1 = MPMIN(size - write_ptr, write_len); int len2 = write_len - len1; memcpy(buffer->buffer + write_ptr, src, len1); |