diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-10-19 19:09:00 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-10-19 19:09:00 +0200 |
| commit | 5d74fa7dc0fa1617d1d11b69769423b1387ec785 (patch) | |
| tree | 882752015b3500c91b8ab3a4d669696f23feb817 /misc/ring.c | |
| parent | c226bc7616ab2ae9de6172660e9cf727f07dc374 (diff) | |
| parent | a2fa0d0b68ce200598122145254f56ae1adff91e (diff) | |
| download | mpv-5d74fa7dc0fa1617d1d11b69769423b1387ec785.tar.bz2 mpv-5d74fa7dc0fa1617d1d11b69769423b1387ec785.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'misc/ring.c')
| -rw-r--r-- | misc/ring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/ring.c b/misc/ring.c index 9ba4306511..d72083475d 100644 --- a/misc/ring.c +++ b/misc/ring.c @@ -21,7 +21,7 @@ #include <libavutil/common.h> #include <assert.h> #include "mpv_talloc.h" -#include "osdep/atomics.h" +#include "osdep/atomic.h" #include "ring.h" struct mp_ring { |