summaryrefslogtreecommitdiffstats
path: root/video/decode
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2013-08-06 22:41:30 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-08-06 22:52:31 +0200
commit406241005e3d897b30a5b168a16ad61f0996c43c (patch)
tree7884ce5d2d4f5aaa253ffd82e567d13bdd2860af /video/decode
parentbc27f946c27e33933a3a696cade78a04902c8dce (diff)
downloadmpv-406241005e3d897b30a5b168a16ad61f0996c43c.tar.bz2
mpv-406241005e3d897b30a5b168a16ad61f0996c43c.tar.xz
core: move contents to mpvcore (2/2)
Followup commit. Fixes all the files references.
Diffstat (limited to 'video/decode')
-rw-r--r--video/decode/dec_video.c6
-rw-r--r--video/decode/vd.c4
-rw-r--r--video/decode/vd_lavc.c14
-rw-r--r--video/decode/vdpau.c2
4 files changed, 13 insertions, 13 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index 595ffb0e16..22aa8f3e75 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -17,21 +17,21 @@
*/
#include "config.h"
-#include "core/options.h"
+#include "mpvcore/options.h"
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <assert.h>
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
#include "osdep/timer.h"
#include "stream/stream.h"
#include "demux/demux_packet.h"
-#include "core/codecs.h"
+#include "mpvcore/codecs.h"
#include "video/out/vo.h"
#include "video/csputils.h"
diff --git a/video/decode/vd.c b/video/decode/vd.c
index db038e3d96..1518d78695 100644
--- a/video/decode/vd.c
+++ b/video/decode/vd.c
@@ -22,8 +22,8 @@
#include <assert.h>
#include "config.h"
-#include "core/mp_msg.h"
-#include "core/options.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/options.h"
#include "video/img_format.h"
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 90fd29f48a..0367c2afed 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -32,12 +32,12 @@
#include "talloc.h"
#include "config.h"
-#include "core/mp_msg.h"
-#include "core/options.h"
-#include "core/bstr.h"
-#include "core/av_opts.h"
-#include "core/av_common.h"
-#include "core/codecs.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/options.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/av_opts.h"
+#include "mpvcore/av_common.h"
+#include "mpvcore/codecs.h"
#include "compat/mpbswap.h"
#include "video/fmt-conversion.h"
@@ -57,7 +57,7 @@
#error palette too large, adapt video/mp_image.h:MP_PALETTE_SIZE
#endif
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
static void init_avctx(sh_video_t *sh, const char *decoder, struct hwdec *hwdec);
static void uninit_avctx(sh_video_t *sh);
diff --git a/video/decode/vdpau.c b/video/decode/vdpau.c
index 512f9170a3..b259ae303a 100644
--- a/video/decode/vdpau.c
+++ b/video/decode/vdpau.c
@@ -22,7 +22,7 @@
#include <libavutil/common.h>
#include "lavc.h"
-#include "core/mp_common.h"
+#include "mpvcore/mp_common.h"
#include "video/fmt-conversion.h"
#include "video/vdpau.h"
#include "video/decode/dec_video.h"