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.

video/decode/vd_lavc.c

@@ -28,17 +28,15 @@
 #include <libavutil/intreadwrite.h>
 #include <libavutil/pixdesc.h>
 
-#include "compat/libav.h"
-
 #include "talloc.h"
 #include "config.h"
 #include "common/msg.h"
 #include "options/options.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "common/av_common.h"
 #include "common/codecs.h"
 
-#include "compat/mpbswap.h"
+#include "osdep/mpbswap.h"
 #include "video/fmt-conversion.h"
 
 #include "vd.h"

video/filter/vf_divtc.c

@@ -26,7 +26,7 @@
 #include "config.h"
 #include "common/msg.h"
 #include "options/m_option.h"
-#include "compat/mpbswap.h"
+#include "osdep/mpbswap.h"
 
 #include "video/img_format.h"
 #include "video/mp_image.h"

video/filter/vf_scale.c

@@ -32,7 +32,6 @@
 #include "video/mp_image.h"
 #include "vf.h"
 #include "video/fmt-conversion.h"
-#include "compat/mpbswap.h"
 
 #include "video/sws_utils.h"
 

video/image_writer.c

@@ -23,8 +23,6 @@
 #include <libavcodec/avcodec.h>
 #include <libavutil/mem.h>
 
-#include "compat/libav.h"
-
 #include "config.h"
 
 #if HAVE_JPEG

video/img_format.c

@@ -22,8 +22,6 @@
 #include <libavutil/pixfmt.h>
 #include <libavutil/pixdesc.h>
 
-#include "compat/libav.h"
-
 #include "video/img_format.h"
 #include "video/mp_image.h"
 #include "video/fmt-conversion.h"

video/img_format.h

@@ -22,7 +22,7 @@
 #include <inttypes.h>
 
 #include "osdep/endian.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 
 #if BYTE_ORDER == BIG_ENDIAN
 #define MP_SELECT_LE_BE(LE, BE) BE

video/out/gl_common.h

@@ -30,7 +30,7 @@
 
 #include "config.h"
 #include "common/msg.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 
 #include "vo.h"
 #include "video/csputils.h"

video/out/gl_lcms.c

@@ -28,7 +28,7 @@
 
 #include "stream/stream.h"
 #include "common/common.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "common/msg.h"
 #include "options/m_option.h"
 #include "options/path.h"

video/out/gl_video.c

@@ -30,7 +30,7 @@
 
 #include "gl_video.h"
 
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "gl_common.h"
 #include "gl_osd.h"
 #include "filter_kernels.h"

video/out/vo.c

@@ -36,7 +36,7 @@
 #include "misc/dispatch.h"
 #include "misc/rendezvous.h"
 #include "options/options.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "vo.h"
 #include "aspect.h"
 #include "input/input.h"

video/out/vo_image.c

@@ -25,7 +25,7 @@
 #include <libswscale/swscale.h>
 
 #include "config.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "osdep/io.h"
 #include "options/path.h"
 #include "talloc.h"

video/out/vo_lavc.c

@@ -22,7 +22,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "compat/libav.h"
 #include "common/common.h"
 #include "options/options.h"
 #include "video/fmt-conversion.h"

video/out/vo_opengl.c

@@ -36,7 +36,7 @@
 
 #include "talloc.h"
 #include "common/common.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "common/msg.h"
 #include "options/m_config.h"
 #include "vo.h"

video/out/wayland_common.c

@@ -31,7 +31,7 @@
 #include <linux/input.h>
 
 #include "config.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "options/options.h"
 #include "common/msg.h"
 #include "talloc.h"

video/out/x11_common.c

@@ -23,7 +23,7 @@
 #include <limits.h>
 
 #include "config.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "options/options.h"
 #include "common/common.h"
 #include "common/msg.h"