From 0112143fdaae0a6264d9e02355e9dc0ca4f7741c Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 17 Dec 2013 02:39:45 +0100 Subject: Split mpvcore/ into common/, misc/, bstr/ --- audio/filter/af.h | 2 +- audio/filter/af_center.c | 2 +- audio/filter/af_channels.c | 2 +- audio/filter/af_delay.c | 2 +- audio/filter/af_drc.c | 2 +- audio/filter/af_equalizer.c | 2 +- audio/filter/af_extrastereo.c | 2 +- audio/filter/af_lavfi.c | 2 +- audio/filter/af_lavrresample.c | 4 ++-- audio/filter/af_pan.c | 2 +- audio/filter/af_scaletempo.c | 2 +- audio/filter/af_sub.c | 2 +- audio/filter/af_volume.c | 2 +- audio/filter/tools.c | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) (limited to 'audio/filter') 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 #include -#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 #include -#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 #include -#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 #include -#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 #include -#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 #include -#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 #include -#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 #include -#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 #include -#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 #include -#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 #include -#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 -- cgit v1.2.3