diff options
| author | wm4 <wm4@nowhere> | 2014-08-29 12:09:04 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-08-29 12:31:52 +0200 |
| commit | 68ff8a0484b592a629ef2bbcb0537265ae36d1d0 (patch) | |
| tree | 9dafc6d3e5bea87957134ddbca426abb4a4c6117 /audio/out | |
| parent | 4bc9c52a122ba51c8fd8f2aea923f8cb2bab1d5f (diff) | |
| download | mpv-68ff8a0484b592a629ef2bbcb0537265ae36d1d0.tar.bz2 mpv-68ff8a0484b592a629ef2bbcb0537265ae36d1d0.tar.xz | |
Move compat/ and bstr/ directory contents somewhere else
bstr.c doesn't really deserve its own directory, and compat had just
a few files, most of which may as well be in osdep. There isn't really
any justification for these extra directories, so get rid of them.
The compat/libav.h was empty - just delete it. We changed our approach
to API compatibility, and will likely not need it anymore.
Diffstat (limited to 'audio/out')
| -rw-r--r-- | audio/out/ao.h | 2 | ||||
| -rw-r--r-- | audio/out/ao_lavc.c | 1 | ||||
| -rwxr-xr-x | audio/out/ao_wasapi.h | 2 | ||||
| -rw-r--r-- | audio/out/pull.c | 2 | ||||
| -rw-r--r-- | audio/out/push.c | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/audio/out/ao.h b/audio/out/ao.h index 59de0c08b1..3eb2925971 100644 --- a/audio/out/ao.h +++ b/audio/out/ao.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "bstr/bstr.h" +#include "misc/bstr.h" #include "common/common.h" #include "audio/chmap.h" #include "audio/chmap_sel.h" diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c index 34cf2c21ac..357c34763d 100644 --- a/audio/out/ao_lavc.c +++ b/audio/out/ao_lavc.c @@ -28,7 +28,6 @@ #include <libavutil/common.h> #include <libavutil/audioconvert.h> -#include "compat/libav.h" #include "config.h" #include "options/options.h" #include "common/common.h" diff --git a/audio/out/ao_wasapi.h b/audio/out/ao_wasapi.h index 52813b586d..36428b4aea 100755 --- a/audio/out/ao_wasapi.h +++ b/audio/out/ao_wasapi.h @@ -28,7 +28,7 @@ #include <mmdeviceapi.h> #include <avrt.h> -#include "compat/atomics.h" +#include "osdep/atomics.h" typedef struct wasapi_state { struct mp_log *log; diff --git a/audio/out/pull.c b/audio/out/pull.c index eb77be81a2..0613006f07 100644 --- a/audio/out/pull.c +++ b/audio/out/pull.c @@ -30,7 +30,7 @@ #include "osdep/timer.h" #include "osdep/threads.h" -#include "compat/atomics.h" +#include "osdep/atomics.h" #include "misc/ring.h" /* diff --git a/audio/out/push.c b/audio/out/push.c index f35c597100..91b4a67571 100644 --- a/audio/out/push.c +++ b/audio/out/push.c @@ -35,7 +35,7 @@ #include "osdep/threads.h" #include "osdep/timer.h" -#include "compat/atomics.h" +#include "osdep/atomics.h" #include "audio/audio.h" #include "audio/audio_buffer.h" |