summaryrefslogtreecommitdiffstats
path: root/audio/filter
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-17 02:02:25 +0100
committerwm4 <wm4@nowhere>2013-12-17 02:07:57 +0100
commiteb15151705d47d23da844449126cc6b4879f110e (patch)
tree661866ee9e73bc893c7963660aae01db503e99aa /audio/filter
parent793f85945fc07db905e54390c065ae51b9eeef9b (diff)
downloadmpv-eb15151705d47d23da844449126cc6b4879f110e.tar.bz2
mpv-eb15151705d47d23da844449126cc6b4879f110e.tar.xz
Move options/config related files from mpvcore/ to options/
Since m_option.h and options.h are extremely often included, a lot of files have to be changed. Moving path.c/h to options/ is a bit questionable, but since this is mainly about access to config files (which are also handled in options/), it's probably ok.
Diffstat (limited to 'audio/filter')
-rw-r--r--audio/filter/af.c4
-rw-r--r--audio/filter/af.h2
-rw-r--r--audio/filter/af_bs2b.c2
-rw-r--r--audio/filter/af_export.c2
-rw-r--r--audio/filter/af_format.c2
-rw-r--r--audio/filter/af_lavfi.c2
-rw-r--r--audio/filter/af_lavrresample.c2
-rw-r--r--audio/filter/af_scaletempo.c2
8 files changed, 9 insertions, 9 deletions
diff --git a/audio/filter/af.c b/audio/filter/af.c
index e2f712d09e..dfe1666e0a 100644
--- a/audio/filter/af.c
+++ b/audio/filter/af.c
@@ -22,8 +22,8 @@
#include <string.h>
#include <assert.h>
-#include "mpvcore/m_option.h"
-#include "mpvcore/m_config.h"
+#include "options/m_option.h"
+#include "options/m_config.h"
#include "af.h"
diff --git a/audio/filter/af.h b/audio/filter/af.h
index fb7f2b3b1d..260d4dae7e 100644
--- a/audio/filter/af.h
+++ b/audio/filter/af.h
@@ -25,7 +25,7 @@
#include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "audio/format.h"
#include "audio/chmap.h"
#include "audio/audio.h"
diff --git a/audio/filter/af_bs2b.c b/audio/filter/af_bs2b.c
index aaada29a74..48df9197dc 100644
--- a/audio/filter/af_bs2b.c
+++ b/audio/filter/af_bs2b.c
@@ -27,7 +27,7 @@
#include <string.h>
#include "af.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
/// Internal specific data of the filter
struct af_bs2b {
diff --git a/audio/filter/af_export.c b/audio/filter/af_export.c
index d39154755b..bbea56cab9 100644
--- a/audio/filter/af_export.c
+++ b/audio/filter/af_export.c
@@ -43,7 +43,7 @@
#include "talloc.h"
#include "af.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
#define DEF_SZ 512 // default buffer size (in samples)
#define SHARED_FILE "mpv-af_export" /* default file name
diff --git a/audio/filter/af_format.c b/audio/filter/af_format.c
index 552587b56e..17af1c43c9 100644
--- a/audio/filter/af_format.c
+++ b/audio/filter/af_format.c
@@ -19,7 +19,7 @@
#include <libavutil/common.h>
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "audio/format.h"
#include "af.h"
diff --git a/audio/filter/af_lavfi.c b/audio/filter/af_lavfi.c
index ab5b8d5495..e764d4fae8 100644
--- a/audio/filter/af_lavfi.c
+++ b/audio/filter/af_lavfi.c
@@ -38,7 +38,7 @@
#include "audio/fmt-conversion.h"
#include "af.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "mpvcore/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 7386c27fa6..65d380e873 100644
--- a/audio/filter/af_lavrresample.c
+++ b/audio/filter/af_lavrresample.c
@@ -55,7 +55,7 @@
#endif
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "mpvcore/av_opts.h"
#include "audio/filter/af.h"
#include "audio/fmt-conversion.h"
diff --git a/audio/filter/af_scaletempo.c b/audio/filter/af_scaletempo.c
index 960aaf8c2e..c54fe44e36 100644
--- a/audio/filter/af_scaletempo.c
+++ b/audio/filter/af_scaletempo.c
@@ -39,7 +39,7 @@
#include "mpvcore/mp_common.h"
#include "af.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
// Data for specific instances of this filter
typedef struct af_scaletempo_s