diff options
author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-08-06 22:41:30 +0200 |
---|---|---|
committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-08-06 22:52:31 +0200 |
commit | 406241005e3d897b30a5b168a16ad61f0996c43c (patch) | |
tree | 7884ce5d2d4f5aaa253ffd82e567d13bdd2860af /video | |
parent | bc27f946c27e33933a3a696cade78a04902c8dce (diff) | |
download | mpv-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')
67 files changed, 161 insertions, 161 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" diff --git a/video/filter/pullup.c b/video/filter/pullup.c index 71f34f068f..2421720d70 100644 --- a/video/filter/pullup.c +++ b/video/filter/pullup.c @@ -21,8 +21,8 @@ #include <string.h> #include "config.h" #include "pullup.h" -#include "core/cpudetect.h" -#include "core/mp_common.h" +#include "mpvcore/cpudetect.h" +#include "mpvcore/mp_common.h" diff --git a/video/filter/vf.c b/video/filter/vf.c index 294c306448..f074c2059b 100644 --- a/video/filter/vf.c +++ b/video/filter/vf.c @@ -26,11 +26,11 @@ #include "config.h" -#include "core/mp_msg.h" -#include "core/m_option.h" -#include "core/m_config.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/m_option.h" +#include "mpvcore/m_config.h" -#include "core/options.h" +#include "mpvcore/options.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf.h b/video/filter/vf.h index c792049b3b..29ce051869 100644 --- a/video/filter/vf.h +++ b/video/filter/vf.h @@ -22,7 +22,7 @@ #include <stdbool.h> #include "video/mp_image.h" -#include "core/mp_common.h" +#include "mpvcore/mp_common.h" #include "video/vfcap.h" diff --git a/video/filter/vf_crop.c b/video/filter/vf_crop.c index c84dd22b84..cd4f077251 100644 --- a/video/filter/vf_crop.c +++ b/video/filter/vf_crop.c @@ -21,14 +21,14 @@ #include <string.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" #include "video/mp_image.h" #include "vf.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" static const struct vf_priv_s { int crop_w,crop_h; diff --git a/video/filter/vf_delogo.c b/video/filter/vf_delogo.c index 6b716cab14..269464f605 100644 --- a/video/filter/vf_delogo.c +++ b/video/filter/vf_delogo.c @@ -28,14 +28,14 @@ #include <errno.h> #include <math.h> -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" #include "video/memcpy_pic.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" //===========================================================================// diff --git a/video/filter/vf_divtc.c b/video/filter/vf_divtc.c index b4718b355f..56a6698027 100644 --- a/video/filter/vf_divtc.c +++ b/video/filter/vf_divtc.c @@ -23,8 +23,8 @@ #include <math.h> #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.h" #include "libavutil/common.h" #include "compat/mpbswap.h" diff --git a/video/filter/vf_dlopen.c b/video/filter/vf_dlopen.c index f40762beab..0a100a8b6b 100644 --- a/video/filter/vf_dlopen.c +++ b/video/filter/vf_dlopen.c @@ -22,13 +22,13 @@ #include <assert.h> #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" #include "vf_dlopen.h" diff --git a/video/filter/vf_down3dright.c b/video/filter/vf_down3dright.c index 895753bafc..7cb75b14dd 100644 --- a/video/filter/vf_down3dright.c +++ b/video/filter/vf_down3dright.c @@ -22,8 +22,8 @@ #include <inttypes.h> #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_dsize.c b/video/filter/vf_dsize.c index ef1d679906..a85457e7ef 100644 --- a/video/filter/vf_dsize.c +++ b/video/filter/vf_dsize.c @@ -22,7 +22,7 @@ #include <inttypes.h> #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_eq.c b/video/filter/vf_eq.c index 76a8b2bc99..802b2f7048 100644 --- a/video/filter/vf_eq.c +++ b/video/filter/vf_eq.c @@ -30,8 +30,8 @@ #include <inttypes.h> #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_expand.c b/video/filter/vf_expand.c index 7b1b76ee97..11983f56ec 100644 --- a/video/filter/vf_expand.c +++ b/video/filter/vf_expand.c @@ -24,8 +24,8 @@ #include <libavutil/common.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" #include "video/mp_image.h" @@ -33,7 +33,7 @@ #include "video/memcpy_pic.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" static struct vf_priv_s { // These four values are a backup of the values parsed from the command line. diff --git a/video/filter/vf_flip.c b/video/filter/vf_flip.c index a28633c7ef..e9d2796724 100644 --- a/video/filter/vf_flip.c +++ b/video/filter/vf_flip.c @@ -21,7 +21,7 @@ #include <string.h> #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/mp_image.h" #include "vf.h" diff --git a/video/filter/vf_format.c b/video/filter/vf_format.c index 639a564113..e5d4c117e7 100644 --- a/video/filter/vf_format.c +++ b/video/filter/vf_format.c @@ -22,13 +22,13 @@ #include <inttypes.h> #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" static struct vf_priv_s { int fmt; diff --git a/video/filter/vf_gradfun.c b/video/filter/vf_gradfun.c index 4217af0b4d..fa136269dd 100644 --- a/video/filter/vf_gradfun.c +++ b/video/filter/vf_gradfun.c @@ -36,14 +36,14 @@ #include <libavutil/common.h> #include "config.h" -#include "core/cpudetect.h" +#include "mpvcore/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" #include "video/memcpy_pic.h" #include "compat/x86_cpu.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" struct vf_priv_s { float cfg_thresh; diff --git a/video/filter/vf_hqdn3d.c b/video/filter/vf_hqdn3d.c index 8351707659..ead6bd3466 100644 --- a/video/filter/vf_hqdn3d.c +++ b/video/filter/vf_hqdn3d.c @@ -24,7 +24,7 @@ #include <inttypes.h> #include <math.h> -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" diff --git a/video/filter/vf_ilpack.c b/video/filter/vf_ilpack.c index f153a4b7d0..d288ef07b6 100644 --- a/video/filter/vf_ilpack.c +++ b/video/filter/vf_ilpack.c @@ -22,8 +22,8 @@ #include <inttypes.h> #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_lavfi.c b/video/filter/vf_lavfi.c index 9cb731ae18..352350804b 100644 --- a/video/filter/vf_lavfi.c +++ b/video/filter/vf_lavfi.c @@ -35,9 +35,9 @@ #include <libavfilter/buffersink.h> #include <libavfilter/buffersrc.h> -#include "core/mp_msg.h" -#include "core/m_option.h" -#include "core/av_opts.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/m_option.h" +#include "mpvcore/av_opts.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_mirror.c b/video/filter/vf_mirror.c index 65e467a9cb..c51c9617cb 100644 --- a/video/filter/vf_mirror.c +++ b/video/filter/vf_mirror.c @@ -22,7 +22,7 @@ #include <inttypes.h> #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_noformat.c b/video/filter/vf_noformat.c index cfdf91401a..2a668c6d44 100644 --- a/video/filter/vf_noformat.c +++ b/video/filter/vf_noformat.c @@ -22,13 +22,13 @@ #include <inttypes.h> #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" static struct vf_priv_s { int fmt; diff --git a/video/filter/vf_noise.c b/video/filter/vf_noise.c index 0af7da5c9a..9d880a6d34 100644 --- a/video/filter/vf_noise.c +++ b/video/filter/vf_noise.c @@ -25,8 +25,8 @@ #include <math.h> #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_phase.c b/video/filter/vf_phase.c index 5754b5f2c7..deb2b0dbe5 100644 --- a/video/filter/vf_phase.c +++ b/video/filter/vf_phase.c @@ -22,7 +22,7 @@ #include <limits.h> #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_pp.c b/video/filter/vf_pp.c index 742c26f95c..2112685c4b 100644 --- a/video/filter/vf_pp.c +++ b/video/filter/vf_pp.c @@ -24,8 +24,8 @@ #include <assert.h> #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_pullup.c b/video/filter/vf_pullup.c index 62d0ff653c..4d0fee6be6 100644 --- a/video/filter/vf_pullup.c +++ b/video/filter/vf_pullup.c @@ -21,8 +21,8 @@ #include <string.h> #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_rotate.c b/video/filter/vf_rotate.c index 94132848fb..05673d76ce 100644 --- a/video/filter/vf_rotate.c +++ b/video/filter/vf_rotate.c @@ -22,7 +22,7 @@ #include <inttypes.h> #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_scale.c b/video/filter/vf_scale.c index 35c9e3cbae..618460965a 100644 --- a/video/filter/vf_scale.c +++ b/video/filter/vf_scale.c @@ -25,8 +25,8 @@ #include <libswscale/swscale.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" #include "video/mp_image.h" @@ -39,7 +39,7 @@ #include "video/csputils.h" #include "video/out/vo.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" static struct vf_priv_s { |