diff options
Diffstat (limited to 'audio')
44 files changed, 60 insertions, 60 deletions
diff --git a/audio/audio.c b/audio/audio.c index a5cf52f5b3..950d25be75 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -20,7 +20,7 @@ #include <libavutil/mem.h> #include "talloc.h" -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "audio.h" static void update_redundant_info(struct mp_audio *mpa) diff --git a/audio/audio_buffer.c b/audio/audio_buffer.c index 53563f90c6..2bd546a532 100644 --- a/audio/audio_buffer.c +++ b/audio/audio_buffer.c @@ -19,7 +19,7 @@ #include <limits.h> #include <assert.h> -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "audio_buffer.h" #include "audio.h" diff --git a/audio/chmap.c b/audio/chmap.c index 0e714f3c83..ce301b6565 100644 --- a/audio/chmap.c +++ b/audio/chmap.c @@ -18,7 +18,7 @@ #include <stdlib.h> #include <assert.h> -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "chmap.h" // Names taken from libavutil/channel_layout.c (Not accessible by API.) diff --git a/audio/chmap.h b/audio/chmap.h index cd6c49f716..ca1e6c2508 100644 --- a/audio/chmap.h +++ b/audio/chmap.h @@ -20,7 +20,7 @@ #include <inttypes.h> #include <stdbool.h> -#include "mpvcore/bstr.h" +#include "bstr/bstr.h" #define MP_NUM_CHANNELS 8 diff --git a/audio/decode/ad.h b/audio/decode/ad.h index 56f8944120..2ac9fb21f6 100644 --- a/audio/decode/ad.h +++ b/audio/decode/ad.h @@ -19,7 +19,7 @@ #ifndef MPLAYER_AD_H #define MPLAYER_AD_H -#include "mpvcore/codecs.h" +#include "common/codecs.h" #include "demux/stheader.h" #include "demux/demux.h" diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c index 8b2c2d1727..9e1ba49fc1 100644 --- a/audio/decode/ad_lavc.c +++ b/audio/decode/ad_lavc.c @@ -29,11 +29,11 @@ #include "talloc.h" #include "config.h" -#include "mpvcore/av_common.h" -#include "mpvcore/codecs.h" -#include "mpvcore/mp_msg.h" +#include "common/av_common.h" +#include "common/codecs.h" +#include "common/msg.h" #include "options/options.h" -#include "mpvcore/av_opts.h" +#include "common/av_opts.h" #include "ad.h" #include "audio/fmt-conversion.h" diff --git a/audio/decode/ad_mpg123.c b/audio/decode/ad_mpg123.c index f65553bd77..57f84e136f 100644 --- a/audio/decode/ad_mpg123.c +++ b/audio/decode/ad_mpg123.c @@ -25,7 +25,7 @@ #include "config.h" #include "ad.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include <mpg123.h> diff --git a/audio/decode/ad_spdif.c b/audio/decode/ad_spdif.c index fdc12772b8..5532d6b5a8 100644 --- a/audio/decode/ad_spdif.c +++ b/audio/decode/ad_spdif.c @@ -26,8 +26,8 @@ #include <libavutil/opt.h> #include "config.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/av_common.h" +#include "common/msg.h" +#include "common/av_common.h" #include "options/options.h" #include "ad.h" diff --git a/audio/decode/dec_audio.c b/audio/decode/dec_audio.c index 1c34c6abe9..51966a7cc6 100644 --- a/audio/decode/dec_audio.c +++ b/audio/decode/dec_audio.c @@ -26,9 +26,9 @@ #include "demux/codec_tags.h" #include "config.h" -#include "mpvcore/codecs.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/bstr.h" +#include "common/codecs.h" +#include "common/msg.h" +#include "bstr/bstr.h" #include "stream/stream.h" #include "demux/demux.h" diff --git a/audio/filter/af.h b/audio/filter/af.h index 260d4dae7e..1e78c01718 100644 --- a/audio/filter/af.h +++ b/audio/filter/af.h @@ -29,7 +29,7 @@ #include "audio/format.h" #include "audio/chmap.h" #include "audio/audio.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" struct af_instance; diff --git a/audio/filter/af_center.c b/audio/filter/af_center.c index d1095e611c..2e626bffb6 100644 --- a/audio/filter/af_center.c +++ b/audio/filter/af_center.c @@ -29,7 +29,7 @@ #include <stdlib.h> #include <string.h> -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "af.h" // Data for specific instances of this filter diff --git a/audio/filter/af_channels.c b/audio/filter/af_channels.c index 8edaa4285a..7bbf952ffe 100644 --- a/audio/filter/af_channels.c +++ b/audio/filter/af_channels.c @@ -27,7 +27,7 @@ #include <string.h> #include <inttypes.h> -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "af.h" #define FR 0 diff --git a/audio/filter/af_delay.c b/audio/filter/af_delay.c index b2c03697fd..f29d065427 100644 --- a/audio/filter/af_delay.c +++ b/audio/filter/af_delay.c @@ -27,7 +27,7 @@ #include <string.h> #include <inttypes.h> -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "af.h" #define L 65536 diff --git a/audio/filter/af_drc.c b/audio/filter/af_drc.c index 0edb99f469..fad34ba500 100644 --- a/audio/filter/af_drc.c +++ b/audio/filter/af_drc.c @@ -26,7 +26,7 @@ #include <math.h> #include <limits.h> -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "af.h" // Methods: diff --git a/audio/filter/af_equalizer.c b/audio/filter/af_equalizer.c index c14fc8451d..7f79dab8ca 100644 --- a/audio/filter/af_equalizer.c +++ b/audio/filter/af_equalizer.c @@ -29,7 +29,7 @@ #include <inttypes.h> #include <math.h> -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "af.h" #define L 2 // Storage for filter taps diff --git a/audio/filter/af_extrastereo.c b/audio/filter/af_extrastereo.c index 92cc4dd216..1e814e8351 100644 --- a/audio/filter/af_extrastereo.c +++ b/audio/filter/af_extrastereo.c @@ -26,7 +26,7 @@ #include <math.h> #include <limits.h> -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "af.h" // Data for specific instances of this filter diff --git a/audio/filter/af_lavfi.c b/audio/filter/af_lavfi.c index e764d4fae8..6fee39afea 100644 --- a/audio/filter/af_lavfi.c +++ b/audio/filter/af_lavfi.c @@ -39,7 +39,7 @@ #include "af.h" #include "options/m_option.h" -#include "mpvcore/av_opts.h" +#include "common/av_opts.h" #define IS_LIBAV_FORK (LIBAVFILTER_VERSION_MICRO < 100) diff --git a/audio/filter/af_lavrresample.c b/audio/filter/af_lavrresample.c index 65d380e873..ee453cc1de 100644 --- a/audio/filter/af_lavrresample.c +++ b/audio/filter/af_lavrresample.c @@ -54,9 +54,9 @@ #error "config.h broken or no resampler found" #endif -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/m_option.h" -#include "mpvcore/av_opts.h" +#include "common/av_opts.h" #include "audio/filter/af.h" #include "audio/fmt-conversion.h" #include "audio/reorder_ch.h" diff --git a/audio/filter/af_pan.c b/audio/filter/af_pan.c index 800221e4bf..accea8026d 100644 --- a/audio/filter/af_pan.c +++ b/audio/filter/af_pan.c @@ -25,7 +25,7 @@ #include <math.h> #include <limits.h> -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "af.h" // Data for specific instances of this filter diff --git a/audio/filter/af_scaletempo.c b/audio/filter/af_scaletempo.c index c54fe44e36..5b93914851 100644 --- a/audio/filter/af_scaletempo.c +++ b/audio/filter/af_scaletempo.c @@ -36,7 +36,7 @@ #include <limits.h> #include <assert.h> -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "af.h" #include "options/m_option.h" diff --git a/audio/filter/af_sub.c b/audio/filter/af_sub.c index ff88272b34..7012e1e129 100644 --- a/audio/filter/af_sub.c +++ b/audio/filter/af_sub.c @@ -32,7 +32,7 @@ #include <stdlib.h> #include <string.h> -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "af.h" #include "dsp.h" diff --git a/audio/filter/af_volume.c b/audio/filter/af_volume.c index 06a1f7dd3c..6a27081b28 100644 --- a/audio/filter/af_volume.c +++ b/audio/filter/af_volume.c @@ -26,7 +26,7 @@ #include <math.h> #include <limits.h> -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "af.h" struct priv { diff --git a/audio/filter/tools.c b/audio/filter/tools.c index c5f423ebf9..217224150e 100644 --- a/audio/filter/tools.c +++ b/audio/filter/tools.c @@ -19,7 +19,7 @@ #include <math.h> #include <string.h> -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "af.h" /* Convert to gain value from dB. Returns AF_OK if of and AF_ERROR if diff --git a/audio/fmt-conversion.c b/audio/fmt-conversion.c index da770a8eda..65f84945c1 100644 --- a/audio/fmt-conversion.c +++ b/audio/fmt-conversion.c @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include <libavutil/avutil.h> #include <libavutil/samplefmt.h> #include "format.h" diff --git a/audio/format.c b/audio/format.c index 1f6b0cac20..e343ca36db 100644 --- a/audio/format.c +++ b/audio/format.c @@ -25,7 +25,7 @@ #include <limits.h> #include <assert.h> -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "audio/filter/af.h" int af_fmt2bits(int format) diff --git a/audio/format.h b/audio/format.h index b318d4cdca..d21707e677 100644 --- a/audio/format.h +++ b/audio/format.h @@ -26,7 +26,7 @@ #include <stdbool.h> #include <sys/types.h> #include "config.h" -#include "mpvcore/bstr.h" +#include "bstr/bstr.h" #if BYTE_ORDER == BIG_ENDIAN #define AF_SELECT_LE_BE(LE, BE) BE diff --git a/audio/mixer.c b/audio/mixer.c index 0972b80533..b3ba9c3a58 100644 --- a/audio/mixer.c +++ b/audio/mixer.c @@ -24,7 +24,7 @@ #include "config.h" #include "audio/out/ao.h" #include "audio/filter/af.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "talloc.h" #include "mixer.h" diff --git a/audio/out/ao.c b/audio/out/ao.c index 6434949cd9..ddd177400d 100644 --- a/audio/out/ao.c +++ b/audio/out/ao.c @@ -29,8 +29,8 @@ #include "options/options.h" #include "options/m_config.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/mpv_global.h" +#include "common/msg.h" +#include "common/global.h" extern const struct ao_driver audio_out_oss; extern const struct ao_driver audio_out_coreaudio; diff --git a/audio/out/ao.h b/audio/out/ao.h index dff9ad6a8b..81737e094d 100644 --- a/audio/out/ao.h +++ b/audio/out/ao.h @@ -21,8 +21,8 @@ #include <stdbool.h> -#include "mpvcore/bstr.h" -#include "mpvcore/mp_common.h" +#include "bstr/bstr.h" +#include "common/common.h" #include "audio/chmap.h" #include "audio/chmap_sel.h" diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c index 372b490e9f..a65b9b05ec 100644 --- a/audio/out/ao_alsa.c +++ b/audio/out/ao_alsa.c @@ -38,7 +38,7 @@ #include "config.h" #include "options/options.h" #include "options/m_option.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #define ALSA_PCM_NEW_HW_PARAMS_API #define ALSA_PCM_NEW_SW_PARAMS_API diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c index 2fb7976c67..4a4091daf9 100644 --- a/audio/out/ao_coreaudio.c +++ b/audio/out/ao_coreaudio.c @@ -40,8 +40,8 @@ #include "audio/format.h" #include "osdep/timer.h" #include "options/m_option.h" -#include "mpvcore/mp_ring.h" -#include "mpvcore/mp_msg.h" +#include "misc/ring.h" +#include "common/msg.h" #include "audio/out/ao_coreaudio_properties.h" #include "audio/out/ao_coreaudio_utils.h" diff --git a/audio/out/ao_coreaudio_utils.h b/audio/out/ao_coreaudio_utils.h index 296f1d2497..cf69248b47 100644 --- a/audio/out/ao_coreaudio_utils.h +++ b/audio/out/ao_coreaudio_utils.h @@ -22,7 +22,7 @@ #include <AudioToolbox/AudioToolbox.h> #include <inttypes.h> #include <stdbool.h> -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "audio/out/ao.h" #define CA_CFSTR_ENCODING kCFStringEncodingASCII diff --git a/audio/out/ao_dsound.c b/audio/out/ao_dsound.c index 1ace4093b4..26c7bb83ed 100644 --- a/audio/out/ao_dsound.c +++ b/audio/out/ao_dsound.c @@ -39,7 +39,7 @@ #include "audio/format.h" #include "ao.h" #include "audio/reorder_ch.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "osdep/timer.h" #include "options/m_option.h" diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c index 8c54796e2b..f4cb5c475e 100644 --- a/audio/out/ao_jack.c +++ b/audio/out/ao_jack.c @@ -29,14 +29,14 @@ #include <unistd.h> #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "ao.h" #include "audio/format.h" #include "osdep/timer.h" #include "options/m_option.h" -#include "mpvcore/mp_ring.h" +#include "misc/ring.h" #include <jack/jack.h> diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c index 713b952229..3e4ba01105 100644 --- a/audio/out/ao_lavc.c +++ b/audio/out/ao_lavc.c @@ -31,14 +31,14 @@ #include "compat/libav.h" #include "config.h" #include "options/options.h" -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "audio/format.h" #include "audio/fmt-conversion.h" #include "talloc.h" #include "ao.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" -#include "mpvcore/encode_lavc.h" +#include "common/encode_lavc.h" struct priv { uint8_t *buffer; diff --git a/audio/out/ao_null.c b/audio/out/ao_null.c index 282511ae40..7c912d94a4 100644 --- a/audio/out/ao_null.c +++ b/audio/out/ao_null.c @@ -31,7 +31,7 @@ #include "config.h" #include "osdep/timer.h" #include "options/m_option.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "audio/format.h" #include "ao.h" diff --git a/audio/out/ao_openal.c b/audio/out/ao_openal.c index c6c2e9e8b8..d613b74208 100644 --- a/audio/out/ao_openal.c +++ b/audio/out/ao_openal.c @@ -35,7 +35,7 @@ #include <AL/alext.h> #endif -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "ao.h" #include "audio/format.h" diff --git a/audio/out/ao_oss.c b/audio/out/ao_oss.c index 9ff7d1a165..574fcf6beb 100644 --- a/audio/out/ao_oss.c +++ b/audio/out/ao_oss.c @@ -36,7 +36,7 @@ #include "config.h" #include "options/options.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #if HAVE_SYS_SOUNDCARD_H #include <sys/soundcard.h> diff --git a/audio/out/ao_pcm.c b/audio/out/ao_pcm.c index 2a086c549f..14548d3be3 100644 --- a/audio/out/ao_pcm.c +++ b/audio/out/ao_pcm.c @@ -34,7 +34,7 @@ #include "audio/format.h" #include "audio/reorder_ch.h" #include "ao.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #ifdef __MINGW32__ // for GetFileType to detect pipes diff --git a/audio/out/ao_portaudio.c b/audio/out/ao_portaudio.c index 6e3d9680fd..8b4efe7944 100644 --- a/audio/out/ao_portaudio.c +++ b/audio/out/ao_portaudio.c @@ -28,8 +28,8 @@ #include "config.h" #include "options/m_option.h" #include "audio/format.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/mp_ring.h" +#include "common/msg.h" +#include "misc/ring.h" #include "ao.h" struct priv { diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c index 651589c34f..f3bce40574 100644 --- a/audio/out/ao_pulse.c +++ b/audio/out/ao_pulse.c @@ -28,7 +28,7 @@ #include "config.h" #include "audio/format.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "ao.h" #include "input/input.h" diff --git a/audio/out/ao_sdl.c b/audio/out/ao_sdl.c index dd2fb894be..ac1fd6febb 100644 --- a/audio/out/ao_sdl.c +++ b/audio/out/ao_sdl.c @@ -23,7 +23,7 @@ #include "audio/format.h" #include "talloc.h" #include "ao.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/m_option.h" #include "osdep/timer.h" diff --git a/audio/out/ao_sndio.c b/audio/out/ao_sndio.c index 6cf08cd095..75ea5d095b 100644 --- a/audio/out/ao_sndio.c +++ b/audio/out/ao_sndio.c @@ -23,7 +23,7 @@ #include <sndio.h> #include "options/m_option.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "audio/format.h" #include "ao.h" diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c index b2ac1f2343..d70b66a493 100644 --- a/audio/out/ao_wasapi.c +++ b/audio/out/ao_wasapi.c @@ -31,10 +31,10 @@ #include "config.h" #include "options/m_option.h" -#include "mpvcore/m_config.h" +#include "common/m_config.h" #include "audio/format.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/mp_ring.h" +#include "common/msg.h" +#include "common/mp_ring.h" #include "ao.h" #ifndef BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE |