diff options
77 files changed, 94 insertions, 134 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" diff --git a/common/codecs.c b/common/codecs.c index 1cbab44969..f89ef0c318 100644 --- a/common/codecs.c +++ b/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" diff --git a/common/common.c b/common/common.c index afab994d72..a74205dd92 100644 --- a/common/common.c +++ b/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, ...) \ diff --git a/common/common.h b/common/common.h index 6c759e9258..b9c3e1e5ea 100644 --- a/common/common.h +++ b/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 diff --git a/common/msg.c b/common/msg.c index 6bde6d481d..866cae5c9d 100644 --- a/common/msg.c +++ b/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" diff --git a/common/msg.h b/common/msg.h index 80aec2f5b3..5ca868d4bb 100644 --- a/common/msg.h +++ b/common/msg.h @@ -24,7 +24,7 @@ #include <stdlib.h> #include <stdint.h> -#include "compat/compiler.h" +#include "osdep/compiler.h" struct mp_log; diff --git a/common/playlist.h b/common/playlist.h index 73227f071c..ea0e3698a2 100644 --- a/common/playlist.h +++ b/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; diff --git a/common/tags.c b/common/tags.c index c722d5d89c..bc9d98ea2f 100644 --- a/common/tags.c +++ b/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) { diff --git a/common/tags.h b/common/tags.h index 375289695f..b6db5f3df2 100644 --- a/common/tags.h +++ b/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; diff --git a/compat/compiler.h b/compat/compiler.h deleted file mode 100644 index a507cd02c2..0000000000 --- a/compat/compiler.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef MPV_COMPILER_H -#define MPV_COMPILER_H - -#define MP_EXPAND_ARGS(...) __VA_ARGS__ - -#ifdef __GNUC__ - -#define MP_NORETURN __attribute__((noreturn)) - -/** Use gcc attribute to check printf fns. a1 is the 1-based index of - * the parameter containing the format, and a2 the index of the first - * argument. **/ -#ifdef __MINGW32__ -// MinGW maps "printf" to the non-standard MSVCRT functions, even if -// __USE_MINGW_ANSI_STDIO is defined and set to 1. We need to use "gnu_printf", -// which isn't necessarily available on other GCC compatible compilers. -#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (gnu_printf, a1, a2))) -#else -#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (printf, a1, a2))) -#endif - -#else -#define PRINTF_ATTRIBUTE(a1, a2) -#define MP_NORETURN -#endif - -#endif diff --git a/compat/libav.h b/compat/libav.h deleted file mode 100644 index 608cedaa8b..0000000000 --- a/compat/libav.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * This file is part of mpv. - * - * mpv is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPV_LIBAV_COMPAT_H -#define MPV_LIBAV_COMPAT_H - -// There's nothing here. But for how long? - -#endif /* MPV_LIBAV_COMPAT_H */ diff --git a/demux/demux.h b/demux/demux.h index 20e6b8a15e..b1c1e28128 100644 --- a/demux/demux.h +++ b/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" diff --git a/demux/demux_cue.c b/demux/demux_cue.c index bfca04dcad..2f2e6fca46 100644 --- a/demux/demux_cue.c +++ b/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" diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 79565993a4..988c3da4e4 100644 --- a/demux/demux_lavf.c +++ b/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" diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index dff08ec894..5e2e0f904f 100644 --- a/demux/demux_mkv.c +++ b/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" diff --git a/demux/ebml.c b/demux/ebml.c index 7e79ee04c8..fdebc4a8ed 100644 --- a/demux/ebml.c +++ b/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 diff --git a/demux/ebml.h b/demux/ebml.h index a544ad41cf..9d7a0cc924 100644 --- a/demux/ebml.h +++ b/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; |