summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-08-29 12:09:04 +0200
committerwm4 <wm4@nowhere>2014-08-29 12:31:52 +0200
commit68ff8a0484b592a629ef2bbcb0537265ae36d1d0 (patch)
tree9dafc6d3e5bea87957134ddbca426abb4a4c6117 /audio
parent4bc9c52a122ba51c8fd8f2aea923f8cb2bab1d5f (diff)
downloadmpv-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')
-rw-r--r--audio/chmap.h2
-rw-r--r--audio/decode/ad_lavc.c2
-rw-r--r--audio/decode/dec_audio.c2
-rw-r--r--audio/filter/af_convertsignendian.c2
-rw-r--r--audio/format.h2
-rw-r--r--audio/out/ao.h2
-rw-r--r--audio/out/ao_lavc.c1
-rwxr-xr-xaudio/out/ao_wasapi.h2
-rw-r--r--audio/out/pull.c2
-rw-r--r--audio/out/push.c2
10 files changed, 8 insertions, 11 deletions
diff --git a/audio/chmap.h b/audio/chmap.h
index 37815a25b6..22cf6fb73b 100644
--- a/audio/chmap.h
+++ b/audio/chmap.h
@@ -20,7 +20,7 @@
#include <inttypes.h>
#include <stdbool.h>
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
#define MP_NUM_CHANNELS 8
diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c
index c4372ba4b3..afff84ef00 100644
--- a/audio/decode/ad_lavc.c
+++ b/audio/decode/ad_lavc.c
@@ -37,8 +37,6 @@
#include "ad.h"
#include "audio/fmt-conversion.h"
-#include "compat/libav.h"
-
struct priv {
AVCodecContext *avctx;
AVFrame *avframe;
diff --git a/audio/decode/dec_audio.c b/audio/decode/dec_audio.c
index c7580a23d8..0afcd8857e 100644
--- a/audio/decode/dec_audio.c
+++ b/audio/decode/dec_audio.c
@@ -28,7 +28,7 @@
#include "config.h"
#include "common/codecs.h"
#include "common/msg.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
#include "stream/stream.h"
#include "demux/demux.h"
diff --git a/audio/filter/af_convertsignendian.c b/audio/filter/af_convertsignendian.c
index 45b365efd8..a0b47b38a3 100644
--- a/audio/filter/af_convertsignendian.c
+++ b/audio/filter/af_convertsignendian.c
@@ -20,7 +20,7 @@
#include "af.h"
#include "audio/format.h"
-#include "compat/mpbswap.h"
+#include "osdep/mpbswap.h"
static bool test_conversion(int src_format, int dst_format)
{
diff --git a/audio/format.h b/audio/format.h
index 788f4ed1c1..c4afe7a428 100644
--- a/audio/format.h
+++ b/audio/format.h
@@ -26,7 +26,7 @@
#include <stdbool.h>
#include "osdep/endian.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
#if BYTE_ORDER == BIG_ENDIAN
#define AF_SELECT_LE_BE(LE, BE) BE
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"