summaryrefslogtreecommitdiffstats
path: root/video/decode
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 /video/decode
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 'video/decode')
-rw-r--r--video/decode/dec_video.c2
-rw-r--r--video/decode/vd_lavc.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index a77e77ec6d..06b00be84f 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -17,7 +17,7 @@
*/
#include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 7e24cbcd90..506481cf1c 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -33,7 +33,7 @@
#include "talloc.h"
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/bstr.h"
#include "mpvcore/av_opts.h"
#include "mpvcore/av_common.h"
@@ -57,7 +57,7 @@
#error palette too large, adapt video/mp_image.h:MP_PALETTE_SIZE
#endif
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
static void init_avctx(struct dec_video *vd, const char *decoder,
struct vd_lavc_hwdec *hwdec);