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.

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
 

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;

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"

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)
 {

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

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"

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"

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;

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"
 
 /*

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"

common/codecs.c

@@ -17,7 +17,7 @@
 
 #include <assert.h>
 #include "talloc.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "common/msg.h"
 #include "codecs.h"
 

common/common.c

@@ -22,7 +22,7 @@
 #include <libavutil/common.h>
 
 #include "talloc.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "common/common.h"
 
 #define appendf(ptr, ...) \

common/common.h

@@ -24,7 +24,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "compat/compiler.h"
+#include "osdep/compiler.h"
 #include "talloc.h"
 
 // double should be able to represent this exactly

common/msg.c

@@ -27,8 +27,8 @@
 
 #include "talloc.h"
 
-#include "bstr/bstr.h"
-#include "compat/atomics.h"
+#include "misc/bstr.h"
+#include "osdep/atomics.h"
 #include "common/common.h"
 #include "common/global.h"
 #include "misc/ring.h"

common/msg.h

@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#include "compat/compiler.h"
+#include "osdep/compiler.h"
 
 struct mp_log;
 

common/playlist.h

@@ -19,7 +19,7 @@
 #define MPLAYER_PLAYLIST_H
 
 #include <stdbool.h>
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 
 struct playlist_param {
     bstr name, value;

common/tags.c

@@ -17,7 +17,7 @@
 
 #include <libavutil/dict.h>
 #include "tags.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 
 void mp_tags_set_str(struct mp_tags *tags, const char *key, const char *value)
 {

common/tags.h

@@ -1,7 +1,7 @@
 #ifndef MP_TAGS_H
 #define MP_TAGS_H
 
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 
 struct mp_tags {
     char **keys;

demux/demux.h

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <stdbool.h>
 
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "common/common.h"
 #include "common/tags.h"
 #include "packet.h"

demux/demux_cue.c

@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "demux.h"
 #include "stream/stream.h"
 

demux/demux_lavf.c

@@ -39,13 +39,12 @@
 # include <libavutil/display.h>
 #endif
 #include <libavutil/opt.h>
-#include "compat/libav.h"
 
 #include "options/options.h"
 #include "common/msg.h"
 #include "common/tags.h"
 #include "common/av_common.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 
 #include "stream/stream.h"
 #include "demux.h"

demux/demux_mkv.c

@@ -44,7 +44,7 @@
 #include "talloc.h"
 #include "common/av_common.h"
 #include "options/options.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "stream/stream.h"
 #include "demux.h"
 #include "stheader.h"

demux/ebml.c

@@ -34,7 +34,7 @@
 #include "talloc.h"
 #include "ebml.h"
 #include "stream/stream.h"
-#include "compat/mpbswap.h"
+#include "osdep/mpbswap.h"
 #include "common/msg.h"
 
 // Whether the id is a known Matroska level 1 element (allowed as element on

demux/ebml.h

@@ -24,7 +24,7 @@
 #include <stdbool.h>
 
 #include "stream/stream.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 
 struct mp_log;
 

demux/ms_hdr.h

@@ -19,7 +19,7 @@
 #ifndef MPLAYER_MS_HDR_H
 #define MPLAYER_MS_HDR_H
 
-#include "compat/mpbswap.h"
+#include "osdep/mpbswap.h"
 #include "video/img_fourcc.h"
 
 // These structs must be binary-compatible to the native win32 types,

input/cmd_parse.c

@@ -18,7 +18,7 @@
 
 #include <stddef.h>
 
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "common/common.h"
 #include "common/msg.h"
 #include "options/m_option.h"

input/event.h

@@ -15,7 +15,7 @@
  * with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 
 struct input_ctx;
 

input/input.c

@@ -48,7 +48,7 @@
 #include "options/path.h"
 #include "talloc.h"
 #include "options/options.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "stream/stream.h"
 #include "common/common.h"
 

input/input.h

@@ -20,7 +20,7 @@
 #define MPLAYER_INPUT_H
 
 #include <stdbool.h>
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 
 #include "cmd_list.h"
 #include "cmd_parse.h"

input/keycodes.c

@@ -20,7 +20,7 @@
 #include <string.h>
 #include <strings.h>
 
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "common/common.h"
 #include "common/msg.h"
 

input/pipe.c

@@ -10,7 +10,7 @@
 #endif
 
 #include "common/msg.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "osdep/io.h"
 #include "input.h"
 #include "cmd_parse.h"

misc/charset_conv.h

@@ -2,7 +2,7 @@
 #define MP_CHARSET_CONV_H
 
 #include <stdbool.h>
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 
 struct mp_log;
 

misc/ring.c

@@ -21,7 +21,7 @@
 #include <libavutil/common.h>
 #include <assert.h>
 #include "talloc.h"
-#include "compat/atomics.h"
+#include "osdep/atomics.h"
 #include "ring.h"
 
 struct mp_ring {

old-makefile

@@ -146,7 +146,6 @@ SOURCES = audio/audio.c \
           audio/out/ao_pcm.c \
           audio/out/pull.c \
           audio/out/push.c \
-          bstr/bstr.c \
           common/av_common.c \
           common/av_log.c \
           common/codecs.c \
@@ -175,6 +174,7 @@ SOURCES = audio/audio.c \
           input/input.c \
           input/keycodes.c \
           input/pipe.c \
+          misc/bstr.c \
           misc/charset_conv.c \
           misc/dispatch.c \
           misc/rendezvous.c \
@@ -303,7 +303,6 @@ DIRS =  . \
         audio/decode \
         audio/filter \
         audio/out \
-        bstr \
         common \
         compat \
         input \

options/m_config.h

@@ -22,7 +22,7 @@
 #include <stddef.h>
 #include <stdbool.h>
 
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 
 // m_config provides an API to manipulate the config variables in MPlayer.
 // It makes use of the Options API to provide a context stack that

options/m_option.h

@@ -23,7 +23,7 @@
 #include <stddef.h>
 #include <stdbool.h>
 
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "audio/chmap.h"
 
 // m_option allows to parse, print and copy data of various types.