From 68ff8a0484b592a629ef2bbcb0537265ae36d1d0 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 29 Aug 2014 12:09:04 +0200
Subject: 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.
---
 sub/osd_libass.c   | 2 +-
 sub/sd_lavc_conv.c | 2 +-
 sub/sd_lavf_srt.c  | 2 +-
 sub/sd_microdvd.c  | 2 +-
 sub/sd_srt.c       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'sub')

diff --git a/sub/osd_libass.c b/sub/osd_libass.c
index 90807fa60a..1fea27ced6 100644
--- a/sub/osd_libass.c
+++ b/sub/osd_libass.c
@@ -25,7 +25,7 @@
 #include "config.h"
 
 #include "talloc.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "common/common.h"
 #include "common/msg.h"
 #include "osd.h"
diff --git a/sub/sd_lavc_conv.c b/sub/sd_lavc_conv.c
index 3414d66b25..09e960cde5 100644
--- a/sub/sd_lavc_conv.c
+++ b/sub/sd_lavc_conv.c
@@ -27,7 +27,7 @@
 #include "talloc.h"
 #include "common/msg.h"
 #include "common/av_common.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "sd.h"
 
 #define HAVE_AV_WEBVTT (LIBAVCODEC_VERSION_MICRO >= 100)
diff --git a/sub/sd_lavf_srt.c b/sub/sd_lavf_srt.c
index 0a48afa990..8f1f7de78b 100644
--- a/sub/sd_lavf_srt.c
+++ b/sub/sd_lavf_srt.c
@@ -21,7 +21,7 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "sd.h"
 
 /*
diff --git a/sub/sd_microdvd.c b/sub/sd_microdvd.c
index 5de9a1814b..cd4d52398e 100644
--- a/sub/sd_microdvd.c
+++ b/sub/sd_microdvd.c
@@ -27,7 +27,7 @@
 #include <libavutil/common.h>
 
 #include "common/msg.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "sd.h"
 
 struct line {
diff --git a/sub/sd_srt.c b/sub/sd_srt.c
index 160f865e11..d2628c9b92 100644
--- a/sub/sd_srt.c
+++ b/sub/sd_srt.c
@@ -28,7 +28,7 @@
 
 #include "common/common.h"
 #include "common/msg.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "misc/ctype.h"
 #include "sd.h"
 
-- 
cgit v1.2.3