diff options
-rw-r--r-- | old-makefile | 4 | ||||
-rw-r--r-- | player/command.c | 2 | ||||
-rw-r--r-- | player/loadfile.c | 2 | ||||
-rw-r--r-- | player/main.c | 1 | ||||
-rw-r--r-- | player/misc.c | 1 | ||||
-rw-r--r-- | stream/resolve/resolve.h (renamed from mpvcore/resolve.h) | 0 | ||||
-rw-r--r-- | stream/resolve/resolve_quvi.c (renamed from mpvcore/resolve_quvi.c) | 0 | ||||
-rw-r--r-- | stream/resolve/resolve_quvi9.c (renamed from mpvcore/resolve_quvi9.c) | 0 | ||||
-rw-r--r-- | wscript_build.py | 4 |
9 files changed, 6 insertions, 8 deletions
diff --git a/old-makefile b/old-makefile index 29ce5e19f3..01a6a2e0b6 100644 --- a/old-makefile +++ b/old-makefile @@ -105,8 +105,8 @@ SOURCES-$(GL_WAYLAND) += video/out/wayland_common.c \ SOURCES-$(JACK) += audio/out/ao_jack.c SOURCES-$(JOYSTICK) += input/joystick.c -SOURCES-$(LIBQUVI) += mpvcore/resolve_quvi.c -SOURCES-$(LIBQUVI9) += mpvcore/resolve_quvi9.c +SOURCES-$(LIBQUVI) += stream/resolve/resolve_quvi.c +SOURCES-$(LIBQUVI9) += stream/resolve/resolve_quvi9.c SOURCES-$(LIRC) += input/lirc.c SOURCES-$(OPENAL) += audio/out/ao_openal.c SOURCES-$(OSS) += audio/out/ao_oss.c diff --git a/player/command.c b/player/command.c index d626e0c4a3..258251e948 100644 --- a/player/command.c +++ b/player/command.c @@ -37,7 +37,7 @@ #include "stream/stream.h" #include "demux/demux.h" #include "demux/stheader.h" -#include "mpvcore/resolve.h" +#include "stream/resolve/resolve.h" #include "mpvcore/playlist.h" #include "mpvcore/playlist_parser.h" #include "sub/osd.h" diff --git a/player/loadfile.c b/player/loadfile.c index 603d48b988..b1e41a08b8 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -38,7 +38,6 @@ #include "mpvcore/options.h" #include "mpvcore/m_property.h" #include "mpvcore/mp_common.h" -#include "mpvcore/resolve.h" #include "mpvcore/encode.h" #include "input/input.h" @@ -49,6 +48,7 @@ #include "audio/out/ao.h" #include "demux/demux.h" #include "stream/stream.h" +#include "stream/resolve/resolve.h" #include "sub/ass_mp.h" #include "sub/dec_sub.h" #include "sub/find_subfiles.h" diff --git a/player/main.c b/player/main.c index d2b7d9dd61..cfaf6f47d5 100644 --- a/player/main.c +++ b/player/main.c @@ -42,7 +42,6 @@ #include "mpvcore/mp_common.h" #include "mpvcore/mp_msg.h" #include "mpvcore/mpv_global.h" -#include "mpvcore/resolve.h" #include "mpvcore/parser-cfg.h" #include "mpvcore/parser-mpcmd.h" #include "mpvcore/playlist.h" diff --git a/player/misc.c b/player/misc.c index 68728295d4..928b56f88c 100644 --- a/player/misc.c +++ b/player/misc.c @@ -30,7 +30,6 @@ #include "mpvcore/options.h" #include "mpvcore/m_property.h" #include "mpvcore/mp_common.h" -#include "mpvcore/resolve.h" #include "mpvcore/encode.h" #include "mpvcore/playlist.h" #include "input/input.h" diff --git a/mpvcore/resolve.h b/stream/resolve/resolve.h index 7a60b29114..7a60b29114 100644 --- a/mpvcore/resolve.h +++ b/stream/resolve/resolve.h diff --git a/mpvcore/resolve_quvi.c b/stream/resolve/resolve_quvi.c index 00279c568f..00279c568f 100644 --- a/mpvcore/resolve_quvi.c +++ b/stream/resolve/resolve_quvi.c diff --git a/mpvcore/resolve_quvi9.c b/stream/resolve/resolve_quvi9.c index ea96f521e3..ea96f521e3 100644 --- a/mpvcore/resolve_quvi9.c +++ b/stream/resolve/resolve_quvi9.c diff --git a/wscript_build.py b/wscript_build.py index 8142ff87c5..66a96d834e 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -184,8 +184,6 @@ def build(ctx): ( "mpvcore/path.c" ), ( "mpvcore/playlist.c" ), ( "mpvcore/playlist_parser.c" ), - ( "mpvcore/resolve_quvi.c", "libquvi4" ), - ( "mpvcore/resolve_quvi9.c", "libquvi9" ), ( "mpvcore/version.c" ), ## Demuxers @@ -260,6 +258,8 @@ def build(ctx): ( "stream/tv.c", "tv" ), ( "stream/tvi_dummy.c", "tv" ), ( "stream/tvi_v4l2.c", "tv-v4l2"), + ( "stream/resolve/resolve_quvi.c", "libquvi4" ), + ( "stream/resolve/resolve_quvi9.c", "libquvi9" ), ## Subtitles ( "sub/ass_mp.c", "libass"), |