summaryrefslogtreecommitdiffstats
path: root/player
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 /player
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 'player')
-rw-r--r--player/lua.c2
-rw-r--r--player/screenshot.c2
-rw-r--r--player/scripting.c2
-rw-r--r--player/timeline/tl_cue.c2
-rw-r--r--player/timeline/tl_matroska.c2
-rw-r--r--player/timeline/tl_mpv_edl.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/player/lua.c b/player/lua.c
index c9c0001347..dbf0756648 100644
--- a/player/lua.c
+++ b/player/lua.c
@@ -39,7 +39,7 @@
#include "options/m_option.h"
#include "input/input.h"
#include "options/path.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
#include "osdep/timer.h"
#include "osdep/threads.h"
#include "sub/osd.h"
diff --git a/player/screenshot.c b/player/screenshot.c
index 63bf29fbd7..4e22afc69d 100644
--- a/player/screenshot.c
+++ b/player/screenshot.c
@@ -28,7 +28,7 @@
#include "screenshot.h"
#include "core.h"
#include "command.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
#include "common/msg.h"
#include "options/path.h"
#include "video/mp_image.h"
diff --git a/player/scripting.c b/player/scripting.c
index 1efe6389f6..3c9829b16d 100644
--- a/player/scripting.c
+++ b/player/scripting.c
@@ -30,7 +30,7 @@
#include "common/common.h"
#include "common/msg.h"
#include "options/path.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
#include "core.h"
#include "client.h"
#include "libmpv/client.h"
diff --git a/player/timeline/tl_cue.c b/player/timeline/tl_cue.c
index d5e8b08164..a4f23c45cf 100644
--- a/player/timeline/tl_cue.c
+++ b/player/timeline/tl_cue.c
@@ -27,7 +27,7 @@
#include "common/msg.h"
#include "demux/demux.h"
#include "options/path.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
#include "common/common.h"
#include "stream/stream.h"
diff --git a/player/timeline/tl_matroska.c b/player/timeline/tl_matroska.c
index cfcc379867..5e69610bd4 100644
--- a/player/timeline/tl_matroska.c
+++ b/player/timeline/tl_matroska.c
@@ -34,7 +34,7 @@
#include "common/msg.h"
#include "demux/demux.h"
#include "options/path.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
#include "common/common.h"
#include "common/playlist.h"
#include "stream/stream.h"
diff --git a/player/timeline/tl_mpv_edl.c b/player/timeline/tl_mpv_edl.c
index 69cd4e97ce..e11b483935 100644
--- a/player/timeline/tl_mpv_edl.c
+++ b/player/timeline/tl_mpv_edl.c
@@ -27,7 +27,7 @@
#include "common/msg.h"
#include "demux/demux.h"
#include "options/path.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
#include "common/common.h"
#include "stream/stream.h"