diff options
| author | wm4 <wm4@nowhere> | 2017-06-23 13:03:50 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-06-23 13:03:50 +0200 |
| commit | ee21bd1baa51d9e6c1cb8c0e05f6d13957d7c93e (patch) | |
| tree | f5fb40b56a7b77d6f0a4dc80b13f83ab72e463cd /options | |
| parent | cad313beffebb518ac880810ce246595f1898732 (diff) | |
| download | mpv-ee21bd1baa51d9e6c1cb8c0e05f6d13957d7c93e.tar.bz2 mpv-ee21bd1baa51d9e6c1cb8c0e05f6d13957d7c93e.tar.xz | |
stream: move cache option declarations to cache.c
If they are copyrightable, iive's changes (commits listed in cache.c)
would make them LGPL 3+. To avoid that options.c becoming LGPL 3, move
the option declarations to cache.c. struct mp_cache_opts is still in
options.h, but we consider that irrelevant, and options.h will become
LGPL 2.1+ later.
Diffstat (limited to 'options')
| -rw-r--r-- | options/options.c | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/options/options.c b/options/options.c index 38af34219b..5eec6070c6 100644 --- a/options/options.c +++ b/options/options.c @@ -65,6 +65,7 @@ extern const struct m_sub_options tv_params_conf; extern const struct m_sub_options stream_cdda_conf; extern const struct m_sub_options stream_dvb_conf; extern const struct m_sub_options stream_lavf_conf; +extern const struct m_sub_options stream_cache_conf; extern const struct m_sub_options sws_conf; extern const struct m_sub_options demux_rawaudio_conf; extern const struct m_sub_options demux_rawvideo_conf; @@ -117,34 +118,6 @@ static const struct m_sub_options screenshot_conf = { .defaults = &image_writer_opts_defaults, }; -#define OPT_BASE_STRUCT struct mp_cache_opts - -const struct m_sub_options stream_cache_conf = { - .opts = (const struct m_option[]){ - OPT_CHOICE_OR_INT("cache", size, 0, 32, 0x7fffffff, - ({"no", 0}, - {"auto", -1}, - {"yes", -2})), - OPT_CHOICE_OR_INT("cache-default", def_size, 0, 32, 0x7fffffff, - ({"no", 0})), - OPT_INTRANGE("cache-initial", initial, 0, 0, 0x7fffffff), - OPT_INTRANGE("cache-seek-min", seek_min, 0, 0, 0x7fffffff), - OPT_INTRANGE("cache-backbuffer", back_buffer, 0, 0, 0x7fffffff), - OPT_STRING("cache-file", file, M_OPT_FILE), - OPT_INTRANGE("cache-file-size", file_max, 0, 0, 0x7fffffff), - {0} - }, - .size = sizeof(struct mp_cache_opts), - .defaults = &(const struct mp_cache_opts){ - .size = -1, - .def_size = 75000, - .initial = 0, - .seek_min = 500, - .back_buffer = 75000, - .file_max = 1024 * 1024, - }, -}; - #undef OPT_BASE_STRUCT #define OPT_BASE_STRUCT struct mp_vo_opts |