History

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.

wm4 committed 12 years ago

Commit 68ff8a01 parent 4bc9c5277 files · +94 −134Browse files

Unified · Split

77 files
  1. audio/chmap.h +1 −1
  2. audio/decode/ad_lavc.c +0 −2
  3. audio/decode/dec_audio.c +1 −1
  4. audio/filter/af_convertsignendian.c +1 −1
  5. audio/format.h +1 −1
  6. audio/out/ao.h +1 −1
  7. audio/out/ao_lavc.c +0 −1
  8. audio/out/ao_wasapi.h +1 −1
  9. audio/out/pull.c +1 −1
  10. audio/out/push.c +1 −1
  11. common/codecs.c +1 −1
  12. common/common.c +1 −1
  13. common/common.h +1 −1
  14. common/msg.c +2 −2
  15. common/msg.h +1 −1
  16. common/playlist.h +1 −1
  17. common/tags.c +1 −1
  18. common/tags.h +1 −1
  19. compat/compiler.h +0 −27
  20. compat/libav.h +0 −24
  21. demux/demux.h +1 −1
  22. demux/demux_cue.c +1 −1
  23. demux/demux_lavf.c +1 −2
  24. demux/demux_mkv.c +1 −1
  25. demux/ebml.c +1 −1
  26. demux/ebml.h +1 −1
  27. demux/ms_hdr.h +1 −1
  28. input/cmd_parse.c +1 −1
  29. input/event.h +1 −1
  30. input/input.c +1 −1
  31. input/input.h +1 −1
  32. input/keycodes.c +1 −1
  33. input/pipe.c +1 −1
  34. misc/bstr.c +0 −0
  35. misc/bstr.h +0 −0
  36. misc/charset_conv.h +1 −1
  37. misc/ring.c +1 −1
  38. old-makefile +1 −2
  39. options/m_config.h +1 −1
  40. options/m_option.h +1 −1
  41. options/path.h +1 −1
  42. osdep/atomics.h +0 −0
  43. osdep/compiler.h +27 −1
  44. osdep/mpbswap.h +0 −0
  45. osdep/terminal-unix.c +1 −1
  46. player/lua.c +1 −1
  47. player/screenshot.c +1 −1
  48. player/scripting.c +1 −1
  49. player/timeline/tl_cue.c +1 −1
  50. player/timeline/tl_matroska.c +1 −1
  51. player/timeline/tl_mpv_edl.c +1 −1
  52. stream/stream.c +2 −2
  53. stream/stream.h +1 −1
  54. stream/stream_cdda.c +1 −1
  55. stream/stream_lavf.c +1 −1
  56. sub/osd_libass.c +1 −1
  57. sub/sd_lavc_conv.c +1 −1
  58. sub/sd_lavf_srt.c +1 −1
  59. sub/sd_microdvd.c +1 −1
  60. sub/sd_srt.c +1 −1
  61. talloc.h +1 −1
  62. video/decode/vd_lavc.c +2 −4
  63. video/filter/vf_divtc.c +1 −1
  64. video/filter/vf_scale.c +0 −1
  65. video/image_writer.c +0 −2
  66. video/img_format.c +0 −2
  67. video/img_format.h +1 −1
  68. video/out/gl_common.h +1 −1
  69. video/out/gl_lcms.c +1 −1
  70. video/out/gl_video.c +1 −1
  71. video/out/vo.c +1 −1
  72. video/out/vo_image.c +1 −1
  73. video/out/vo_lavc.c +0 −1
  74. video/out/vo_opengl.c +1 −1
  75. video/out/wayland_common.c +1 −1
  76. video/out/x11_common.c +1 −1
  77. wscript_build.py +1 −3
audio/chmap.h+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
2020
2121 #include <inttypes.h>
2222 #include <stdbool.h>
23−#include "bstr/bstr.h"
23+#include "misc/bstr.h"
2424
2525 #define MP_NUM_CHANNELS 8
2626
audio/decode/ad_lavc.c+0−2
@@ -37,8 +37,6 @@ · 36 unmodified lines
3737 #include "ad.h"
3838 #include "audio/fmt-conversion.h"
3939
40−#include "compat/libav.h"
41−
4240 struct priv {
4341 AVCodecContext *avctx;
4442 AVFrame *avframe;
audio/decode/dec_audio.c+1−1
@@ -28,7 +28,7 @@ · 27 unmodified lines
2828 #include "config.h"
2929 #include "common/codecs.h"
3030 #include "common/msg.h"
31−#include "bstr/bstr.h"
31+#include "misc/bstr.h"
3232
3333 #include "stream/stream.h"
3434 #include "demux/demux.h"
audio/filter/af_convertsignendian.c+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
2020
2121 #include "af.h"
2222 #include "audio/format.h"
23−#include "compat/mpbswap.h"
23+#include "osdep/mpbswap.h"
2424
2525 static bool test_conversion(int src_format, int dst_format)
2626 {
audio/format.h+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
2626 #include <stdbool.h>
2727
2828 #include "osdep/endian.h"
29−#include "bstr/bstr.h"
29+#include "misc/bstr.h"
3030
3131 #if BYTE_ORDER == BIG_ENDIAN
3232 #define AF_SELECT_LE_BE(LE, BE) BE
audio/out/ao.h+1−1
@@ -21,7 +21,7 @@ · 20 unmodified lines
2121
2222 #include <stdbool.h>
2323
24−#include "bstr/bstr.h"
24+#include "misc/bstr.h"
2525 #include "common/common.h"
2626 #include "audio/chmap.h"
2727 #include "audio/chmap_sel.h"
audio/out/ao_lavc.c+0−1
@@ -28,7 +28,6 @@ · 27 unmodified lines
2828 #include <libavutil/common.h>
2929 #include <libavutil/audioconvert.h>
3030
31−#include "compat/libav.h"
3231 #include "config.h"
3332 #include "options/options.h"
3433 #include "common/common.h"
audio/out/ao_wasapi.h+1−1
@@ -28,7 +28,7 @@ · 27 unmodified lines
2828 #include <mmdeviceapi.h>
2929 #include <avrt.h>
3030
31−#include "compat/atomics.h"
31+#include "osdep/atomics.h"
3232
3333 typedef struct wasapi_state {
3434 struct mp_log *log;
audio/out/pull.c+1−1
@@ -30,7 +30,7 @@ · 29 unmodified lines
3030
3131 #include "osdep/timer.h"
3232 #include "osdep/threads.h"
33−#include "compat/atomics.h"
33+#include "osdep/atomics.h"
3434 #include "misc/ring.h"
3535
3636 /*
audio/out/push.c+1−1
@@ -35,7 +35,7 @@ · 34 unmodified lines
3535
3636 #include "osdep/threads.h"
3737 #include "osdep/timer.h"
38−#include "compat/atomics.h"
38+#include "osdep/atomics.h"
3939
4040 #include "audio/audio.h"
4141 #include "audio/audio_buffer.h"
common/codecs.c+1−1
@@ -17,7 +17,7 @@ · 16 unmodified lines
1717
1818 #include <assert.h>
1919 #include "talloc.h"
20−#include "bstr/bstr.h"
20+#include "misc/bstr.h"
2121 #include "common/msg.h"
2222 #include "codecs.h"
2323
common/common.c+1−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
2222 #include <libavutil/common.h>
2323
2424 #include "talloc.h"
25−#include "bstr/bstr.h"
25+#include "misc/bstr.h"
2626 #include "common/common.h"
2727
2828 #define appendf(ptr, ...) \
common/common.h+1−1
@@ -24,7 +24,7 @@ · 23 unmodified lines
2424 #include <stdbool.h>
2525 #include <stdint.h>
2626
27−#include "compat/compiler.h"
27+#include "osdep/compiler.h"
2828 #include "talloc.h"
2929
3030 // double should be able to represent this exactly
common/msg.c+2−2
@@ -27,8 +27,8 @@ · 26 unmodified lines
2727
2828 #include "talloc.h"
2929
30−#include "bstr/bstr.h"
31−#include "compat/atomics.h"
30+#include "misc/bstr.h"
31+#include "osdep/atomics.h"
3232 #include "common/common.h"
3333 #include "common/global.h"
3434 #include "misc/ring.h"
common/msg.h+1−1
@@ -24,7 +24,7 @@ · 23 unmodified lines
2424 #include <stdlib.h>
2525 #include <stdint.h>
2626
27−#include "compat/compiler.h"
27+#include "osdep/compiler.h"
2828
2929 struct mp_log;
3030
common/playlist.h+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919 #define MPLAYER_PLAYLIST_H
2020
2121 #include <stdbool.h>
22−#include "bstr/bstr.h"
22+#include "misc/bstr.h"
2323
2424 struct playlist_param {
2525 bstr name, value;
common/tags.c+1−1
@@ -17,7 +17,7 @@ · 16 unmodified lines
1717
1818 #include <libavutil/dict.h>
1919 #include "tags.h"
20−#include "bstr/bstr.h"
20+#include "misc/bstr.h"
2121
2222 void mp_tags_set_str(struct mp_tags *tags, const char *key, const char *value)
2323 {
common/tags.h+1−1
@@ -1,7 +1,7 @@
11 #ifndef MP_TAGS_H
22 #define MP_TAGS_H
33
4−#include "bstr/bstr.h"
4+#include "misc/bstr.h"
55
66 struct mp_tags {
77 char **keys;
compat/compiler.h+0−27
@@ -1,27 +0,0 @@
1−#ifndef MPV_COMPILER_H
2−#define MPV_COMPILER_H
3−
4−#define MP_EXPAND_ARGS(...) __VA_ARGS__
5−
6−#ifdef __GNUC__
7−
8−#define MP_NORETURN __attribute__((noreturn))
9−
10−/** Use gcc attribute to check printf fns. a1 is the 1-based index of
11− * the parameter containing the format, and a2 the index of the first
12− * argument. **/
13−#ifdef __MINGW32__
14−// MinGW maps "printf" to the non-standard MSVCRT functions, even if
15−// __USE_MINGW_ANSI_STDIO is defined and set to 1. We need to use "gnu_printf",
16−// which isn't necessarily available on other GCC compatible compilers.
17−#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (gnu_printf, a1, a2)))
18−#else
19−#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (printf, a1, a2)))
20−#endif
21−
22−#else
23−#define PRINTF_ATTRIBUTE(a1, a2)
24−#define MP_NORETURN
25−#endif
26−
27−#endif
compat/libav.h+0−24
@@ -1,24 +0,0 @@
1−/*
2− * This file is part of mpv.
3− *
4− * mpv is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; either version 2 of the License, or
7− * (at your option) any later version.
8− *
9− * MPlayer is distributed in the hope that it will be useful,
10− * but WITHOUT ANY WARRANTY; without even the implied warranty of
11− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12− * GNU General Public License for more details.
13− *
14− * You should have received a copy of the GNU General Public License along
15− * with MPlayer; if not, write to the Free Software Foundation, Inc.,
16− * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17− */
18−
19−#ifndef MPV_LIBAV_COMPAT_H
20−#define MPV_LIBAV_COMPAT_H
21−
22−// There's nothing here. But for how long?
23−
24−#endif /* MPV_LIBAV_COMPAT_H */
demux/demux.h+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
2525 #include <string.h>
2626 #include <stdbool.h>
2727
28−#include "bstr/bstr.h"
28+#include "misc/bstr.h"
2929 #include "common/common.h"
3030 #include "common/tags.h"
3131 #include "packet.h"
demux/demux_cue.c+1−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
2222 #include <stdbool.h>
2323 #include <string.h>
2424
25−#include "bstr/bstr.h"
25+#include "misc/bstr.h"
2626 #include "demux.h"
2727 #include "stream/stream.h"
2828
demux/demux_lavf.c+1−2
@@ -39,13 +39,12 @@ · 38 unmodified lines
3939 # include <libavutil/display.h>
4040 #endif
4141 #include <libavutil/opt.h>
42−#include "compat/libav.h"
4342
4443 #include "options/options.h"
4544 #include "common/msg.h"
4645 #include "common/tags.h"
4746 #include "common/av_common.h"
48−#include "bstr/bstr.h"
47+#include "misc/bstr.h"
4948
5049 #include "stream/stream.h"
5150 #include "demux.h"
demux/demux_mkv.c+1−1
@@ -44,7 +44,7 @@ · 43 unmodified lines
4444 #include "talloc.h"
4545 #include "common/av_common.h"
4646 #include "options/options.h"
47−#include "bstr/bstr.h"
47+#include "misc/bstr.h"
4848 #include "stream/stream.h"
4949 #include "demux.h"
5050 #include "stheader.h"
demux/ebml.c+1−1
@@ -34,7 +34,7 @@ · 33 unmodified lines
3434 #include "talloc.h"
3535 #include "ebml.h"
3636 #include "stream/stream.h"
37−#include "compat/mpbswap.h"
37+#include "osdep/mpbswap.h"
3838 #include "common/msg.h"
3939
4040 // Whether the id is a known Matroska level 1 element (allowed as element on
demux/ebml.h+1−1
@@ -24,7 +24,7 @@ · 23 unmodified lines
2424 #include <stdbool.h>
2525
2626 #include "stream/stream.h"
27−#include "bstr/bstr.h"
27+#include "misc/bstr.h"
2828
2929 struct mp_log;
3030
demux/ms_hdr.h+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919 #ifndef MPLAYER_MS_HDR_H
2020 #define MPLAYER_MS_HDR_H
2121
22−#include "compat/mpbswap.h"
22+#include "osdep/mpbswap.h"
2323 #include "video/img_fourcc.h"
2424
2525 // These structs must be binary-compatible to the native win32 types,
input/cmd_parse.c+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
1818
1919 #include <stddef.h>
2020
21−#include "bstr/bstr.h"
21+#include "misc/bstr.h"
2222 #include "common/common.h"
2323 #include "common/msg.h"
2424 #include "options/m_option.h"
input/event.h+1−1
@@ -15,7 +15,7 @@ · 14 unmodified lines
1515 * with mpv. If not, see <http://www.gnu.org/licenses/>.
1616 */
1717
18−#include "bstr/bstr.h"
18+#include "misc/bstr.h"
1919
2020 struct input_ctx;
2121
input/input.c+1−1
@@ -48,7 +48,7 @@ · 47 unmodified lines
4848 #include "options/path.h"
4949 #include "talloc.h"
5050 #include "options/options.h"
51−#include "bstr/bstr.h"
51+#include "misc/bstr.h"
5252 #include "stream/stream.h"
5353 #include "common/common.h"
5454
input/input.h+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
2020 #define MPLAYER_INPUT_H
2121
2222 #include <stdbool.h>
23−#include "bstr/bstr.h"
23+#include "misc/bstr.h"
2424
2525 #include "cmd_list.h"
2626 #include "cmd_parse.h"
input/keycodes.c+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
2020 #include <string.h>
2121 #include <strings.h>
2222
23−#include "bstr/bstr.h"
23+#include "misc/bstr.h"
2424 #include "common/common.h"
2525 #include "common/msg.h"
2626
input/pipe.c+1−1
@@ -10,7 +10,7 @@ · 9 unmodified lines
1010 #endif
1111
1212 #include "common/msg.h"
13−#include "bstr/bstr.h"
13+#include "misc/bstr.h"
1414 #include "osdep/io.h"
1515 #include "input.h"
1616 #include "cmd_parse.h"
misc/bstr.crenamed from bstr/bstr.c+0−0

File renamed without changes.

misc/bstr.hrenamed from bstr/bstr.h+0−0

File renamed without changes.

misc/charset_conv.h+1−1
@@ -2,7 +2,7 @@ · 1 unmodified line
22 #define MP_CHARSET_CONV_H
33
44 #include <stdbool.h>
5−#include "bstr/bstr.h"
5+#include "misc/bstr.h"
66
77 struct mp_log;
88
misc/ring.c+1−1
@@ -21,7 +21,7 @@ · 20 unmodified lines
2121 #include <libavutil/common.h>
2222 #include <assert.h>
2323 #include "talloc.h"
24−#include "compat/atomics.h"
24+#include "osdep/atomics.h"
2525 #include "ring.h"
2626
2727 struct mp_ring {
old-makefile+1−2
@@ -146,7 +146,6 @@ SOURCES = audio/audio.c \ · 145 unmodified lines
146146 audio/out/ao_pcm.c \
147147 audio/out/pull.c \
148148 audio/out/push.c \
149− bstr/bstr.c \
150149 common/av_common.c \
151150 common/av_log.c \
152151 common/codecs.c \
@@ -175,6 +174,7 @@ SOURCES = audio/audio.c \ · 22 unmodified lines
175174 input/input.c \
176175 input/keycodes.c \
177176 input/pipe.c \
177+ misc/bstr.c \
178178 misc/charset_conv.c \
179179 misc/dispatch.c \
180180 misc/rendezvous.c \
@@ -303,7 +303,6 @@ DIRS = . \ · 122 unmodified lines
303303 audio/decode \
304304 audio/filter \
305305 audio/out \
306− bstr \
307306 common \
308307 compat \
309308 input \
options/m_config.h+1−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
2222 #include <stddef.h>
2323 #include <stdbool.h>
2424
25−#include "bstr/bstr.h"
25+#include "misc/bstr.h"
2626
2727 // m_config provides an API to manipulate the config variables in MPlayer.
2828 // It makes use of the Options API to provide a context stack that
options/m_option.h+1−1
@@ -23,7 +23,7 @@ · 22 unmodified lines
2323 #include <stddef.h>
2424 #include <stdbool.h>
2525
26−#include "bstr/bstr.h"
26+#include "misc/bstr.h"
2727 #include "audio/chmap.h"
2828
2929 // m_option allows to parse, print and copy data of various types.
options/path.h+1−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
2222 #define MPLAYER_PATH_H
2323
2424 #include <stdbool.h>
25−#include "bstr/bstr.h"
25+#include "misc/bstr.h"
2626
2727 struct mpv_global;
2828
osdep/atomics.hrenamed from compat/atomics.h+0−0

File renamed without changes.

osdep/compiler.h+27−1
@@ -1 +1,27 @@
1−#include "compat/compiler.h"
1+#ifndef MPV_COMPILER_H
2+#define MPV_COMPILER_H
3+
4+#define MP_EXPAND_ARGS(...) __VA_ARGS__
5+
6+#ifdef __GNUC__
7+
8+#define MP_NORETURN __attribute__((noreturn))
9+
10+/** Use gcc attribute to check printf fns. a1 is the 1-based index of
11+ * the parameter containing the format, and a2 the index of the first
12+ * argument. **/
13+#ifdef __MINGW32__
14+// MinGW maps "printf" to the non-standard MSVCRT functions, even if
15+// __USE_MINGW_ANSI_STDIO is defined and set to 1. We need to use "gnu_printf",
16+// which isn't necessarily available on other GCC compatible compilers.
17+#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (gnu_printf, a1, a2)))
18+#else
19+#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (printf, a1, a2)))
20+#endif
21+
22+#else
23+#define PRINTF_ATTRIBUTE(a1, a2)
24+#define MP_NORETURN
25+#endif
26+
27+#endif
osdep/mpbswap.hrenamed from compat/mpbswap.h+0−0

File renamed without changes.

osdep/terminal-unix.c+1−1
@@ -43,7 +43,7 @@ · 42 unmodified lines
4343 #include <unistd.h>
4444
4545 #include "common/common.h"
46−#include "bstr/bstr.h"
46+#include "misc/bstr.h"
4747 #include "input/input.h"
4848 #include "input/keycodes.h"
4949 #include "misc/ctype.h"
player/lua.c+1−1
@@ -39,7 +39,7 @@ · 38 unmodified lines
3939 #include "options/m_option.h"
4040 #include "input/input.h"
4141 #include "options/path.h"
42−#include "bstr/bstr.h"
42+#include "misc/bstr.h"
4343 #include "osdep/timer.h"
4444 #include "osdep/threads.h"
4545 #include "sub/osd.h"
player/screenshot.c+1−1
@@ -28,7 +28,7 @@ · 27 unmodified lines
2828 #include "screenshot.h"
2929 #include "core.h"
3030 #include "command.h"
31−#include "bstr/bstr.h"
31+#include "misc/bstr.h"
3232 #include "common/msg.h"
3333 #include "options/path.h"
3434 #include "video/mp_image.h"
player/scripting.c+1−1
@@ -30,7 +30,7 @@ · 29 unmodified lines
3030 #include "common/common.h"
3131 #include "common/msg.h"
3232 #include "options/path.h"
33−#include "bstr/bstr.h"
33+#include "misc/bstr.h"
3434 #include "core.h"
3535 #include "client.h"
3636 #include "libmpv/client.h"
player/timeline/tl_cue.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
2727 #include "common/msg.h"
2828 #include "demux/demux.h"
2929 #include "options/path.h"
30−#include "bstr/bstr.h"
30+#include "misc/bstr.h"
3131 #include "common/common.h"
3232 #include "stream/stream.h"
3333
player/timeline/tl_matroska.c+1−1
@@ -34,7 +34,7 @@ · 33 unmodified lines
3434 #include "common/msg.h"
3535 #include "demux/demux.h"
3636 #include "options/path.h"
37−#include "bstr/bstr.h"
37+#include "misc/bstr.h"
3838 #include "common/common.h"
3939 #include "common/playlist.h"
4040 #include "stream/stream.h"
player/timeline/tl_mpv_edl.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
2727 #include "common/msg.h"
2828 #include "demux/demux.h"
2929 #include "options/path.h"
30−#include "bstr/bstr.h"
30+#include "misc/bstr.h"
3131 #include "common/common.h"
3232 #include "stream/stream.h"
3333
stream/stream.c+2−2
@@ -31,7 +31,7 @@ · 30 unmodified lines
3131 #include <assert.h>
3232
3333 #include <libavutil/common.h>
34−#include "compat/mpbswap.h"
34+#include "osdep/mpbswap.h"
3535
3636 #include "talloc.h"
3737
@@ -39,7 +39,7 @@ · 1 unmodified line
3939
4040 #include "common/common.h"
4141 #include "common/global.h"
42−#include "bstr/bstr.h"
42+#include "misc/bstr.h"
4343 #include "common/msg.h"
4444 #include "options/options.h"
4545 #include "options/path.h"
stream/stream.h+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
2727 #include <sys/types.h>
2828 #include <fcntl.h>
2929
30−#include "bstr/bstr.h"
30+#include "misc/bstr.h"
3131
3232 enum streamtype {
3333 STREAMTYPE_GENERIC = 0,
stream/stream_cdda.c+1−1
@@ -46,7 +46,7 @@ · 45 unmodified lines
4646 #include "options/m_option.h"
4747 #include "options/m_config.h"
4848 #include "options/options.h"
49−#include "compat/mpbswap.h"
49+#include "osdep/mpbswap.h"
5050
5151 #include "common/msg.h"
5252
stream/stream_lavf.c+1−1
@@ -31,7 +31,7 @@ · 30 unmodified lines
3131
3232 #include "cookies.h"
3333
34−#include "bstr/bstr.h"
34+#include "misc/bstr.h"
3535 #include "talloc.h"
3636
3737 struct stream_lavf_params *stream_lavf_opts;
sub/osd_libass.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
2525 #include "config.h"
2626
2727 #include "talloc.h"
28−#include "bstr/bstr.h"
28+#include "misc/bstr.h"
2929 #include "common/common.h"
3030 #include "common/msg.h"
3131 #include "osd.h"
sub/sd_lavc_conv.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
2727 #include "talloc.h"
2828 #include "common/msg.h"
2929 #include "common/av_common.h"
30−#include "bstr/bstr.h"
30+#include "misc/bstr.h"
3131 #include "sd.h"
3232
3333 #define HAVE_AV_WEBVTT (LIBAVCODEC_VERSION_MICRO >= 100)
sub/sd_lavf_srt.c+1−1
@@ -21,7 +21,7 @@ · 20 unmodified lines
2121 #include <inttypes.h>
2222 #include <assert.h>
2323
24−#include "bstr/bstr.h"
24+#include "misc/bstr.h"
2525 #include "sd.h"
2626
2727 /*
sub/sd_microdvd.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
2727 #include <libavutil/common.h>
2828
2929 #include "common/msg.h"
30−#include "bstr/bstr.h"
30+#include "misc/bstr.h"
3131 #include "sd.h"
3232
3333 struct line {
sub/sd_srt.c+1−1
@@ -28,7 +28,7 @@ · 27 unmodified lines
2828
2929 #include "common/common.h"
3030 #include "common/msg.h"
31−#include "bstr/bstr.h"
31+#include "misc/bstr.h"
3232 #include "misc/ctype.h"
3333 #include "sd.h"
3434
talloc.h+1−1
@@ -2,6 +2,6 @@ · 1 unmodified line
22 #include <stdio.h>
33 #include <stdarg.h>
44
5−#include "compat/compiler.h"
5+#include "osdep/compiler.h"
66
77 #include "ta/ta_talloc.h"
video/decode/vd_lavc.c+2−4
@@ -28,17 +28,15 @@ · 27 unmodified lines
2828 #include <libavutil/intreadwrite.h>
2929 #include <libavutil/pixdesc.h>
3030
31−#include "compat/libav.h"
32−
3331 #include "talloc.h"
3432 #include "config.h"
3533 #include "common/msg.h"
3634 #include "options/options.h"
37−#include "bstr/bstr.h"
35+#include "misc/bstr.h"
3836 #include "common/av_common.h"
3937 #include "common/codecs.h"
4038
41−#include "compat/mpbswap.h"
39+#include "osdep/mpbswap.h"
4240 #include "video/fmt-conversion.h"
4341
4442 #include "vd.h"
video/filter/vf_divtc.c+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
2626 #include "config.h"
2727 #include "common/msg.h"
2828 #include "options/m_option.h"
29−#include "compat/mpbswap.h"
29+#include "osdep/mpbswap.h"
3030
3131 #include "video/img_format.h"
3232 #include "video/mp_image.h"
video/filter/vf_scale.c+0−1
@@ -32,7 +32,6 @@ · 31 unmodified lines
3232 #include "video/mp_image.h"
3333 #include "vf.h"
3434 #include "video/fmt-conversion.h"
35−#include "compat/mpbswap.h"
3635
3736 #include "video/sws_utils.h"
3837
video/image_writer.c+0−2
@@ -23,8 +23,6 @@ · 22 unmodified lines
2323 #include <libavcodec/avcodec.h>
2424 #include <libavutil/mem.h>
2525
26−#include "compat/libav.h"
27−
2826 #include "config.h"
2927
3028 #if HAVE_JPEG
video/img_format.c+0−2
@@ -22,8 +22,6 @@ · 21 unmodified lines
2222 #include <libavutil/pixfmt.h>
2323 #include <libavutil/pixdesc.h>
2424
25−#include "compat/libav.h"
26−
2725 #include "video/img_format.h"
2826 #include "video/mp_image.h"
2927 #include "video/fmt-conversion.h"
video/img_format.h+1−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
2222 #include <inttypes.h>
2323
2424 #include "osdep/endian.h"
25−#include "bstr/bstr.h"
25+#include "misc/bstr.h"
2626
2727 #if BYTE_ORDER == BIG_ENDIAN
2828 #define MP_SELECT_LE_BE(LE, BE) BE
video/out/gl_common.h+1−1
@@ -30,7 +30,7 @@ · 29 unmodified lines
3030
3131 #include "config.h"
3232 #include "common/msg.h"
33−#include "bstr/bstr.h"
33+#include "misc/bstr.h"
3434
3535 #include "vo.h"
3636 #include "video/csputils.h"
video/out/gl_lcms.c+1−1
@@ -28,7 +28,7 @@ · 27 unmodified lines
2828
2929 #include "stream/stream.h"
3030 #include "common/common.h"
31−#include "bstr/bstr.h"
31+#include "misc/bstr.h"
3232 #include "common/msg.h"
3333 #include "options/m_option.h"
3434 #include "options/path.h"
video/out/gl_video.c+1−1
@@ -30,7 +30,7 @@ · 29 unmodified lines
3030
3131 #include "gl_video.h"
3232
33−#include "bstr/bstr.h"
33+#include "misc/bstr.h"
3434 #include "gl_common.h"
3535 #include "gl_osd.h"
3636 #include "filter_kernels.h"
video/out/vo.c+1−1
@@ -36,7 +36,7 @@ · 35 unmodified lines
3636 #include "misc/dispatch.h"
3737 #include "misc/rendezvous.h"
3838 #include "options/options.h"
39−#include "bstr/bstr.h"
39+#include "misc/bstr.h"
4040 #include "vo.h"
4141 #include "aspect.h"
4242 #include "input/input.h"
video/out/vo_image.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
2525 #include <libswscale/swscale.h>
2626
2727 #include "config.h"
28−#include "bstr/bstr.h"
28+#include "misc/bstr.h"
2929 #include "osdep/io.h"
3030 #include "options/path.h"
3131 #include "talloc.h"
video/out/vo_lavc.c+0−1
@@ -22,7 +22,6 @@ · 21 unmodified lines
2222
2323 #include <stdio.h>
2424 #include <stdlib.h>
25−#include "compat/libav.h"
2625 #include "common/common.h"
2726 #include "options/options.h"
2827 #include "video/fmt-conversion.h"
video/out/vo_opengl.c+1−1
@@ -36,7 +36,7 @@ · 35 unmodified lines
3636
3737 #include "talloc.h"
3838 #include "common/common.h"
39−#include "bstr/bstr.h"
39+#include "misc/bstr.h"
4040 #include "common/msg.h"
4141 #include "options/m_config.h"
4242 #include "vo.h"
video/out/wayland_common.c+1−1
@@ -31,7 +31,7 @@ · 30 unmodified lines
3131 #include <linux/input.h>
3232
3333 #include "config.h"
34−#include "bstr/bstr.h"
34+#include "misc/bstr.h"
3535 #include "options/options.h"
3636 #include "common/msg.h"
3737 #include "talloc.h"
video/out/x11_common.c+1−1
@@ -23,7 +23,7 @@ · 22 unmodified lines
2323 #include <limits.h>
2424
2525 #include "config.h"
26−#include "bstr/bstr.h"
26+#include "misc/bstr.h"
2727 #include "options/options.h"
2828 #include "common/common.h"
2929 #include "common/msg.h"
wscript_build.py+1−3
@@ -155,9 +155,6 @@ def build(ctx): · 154 unmodified lines
155155 ( "audio/out/pull.c" ),
156156 ( "audio/out/push.c" ),
157157
158− ## Bstr
159− ( "bstr/bstr.c" ),
160−
161158 ## Core
162159 ( "common/av_common.c" ),
163160 ( "common/av_log.c" ),
@@ -198,6 +195,7 @@ def build(ctx): · 34 unmodified lines
198195 ( "input/lirc.c", "lirc" ),
199196
200197 ## Misc
198+ ( "misc/bstr.c" ),
201199 ( "misc/charset_conv.c" ),
202200 ( "misc/dispatch.c" ),
203201 ( "misc/ring.c" ),

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t