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/ring.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/ring.c')
-rw-r--r-- | misc/ring.c | 11 |
1 files changed, 6 insertions, 5 deletions
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); |