diff options
author | wm4 <wm4@nowhere> | 2020-03-01 00:28:09 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2020-03-01 00:28:09 +0100 |
commit | ae1aeab7aa2b7c378a9f734d227121f84ae85ed2 (patch) | |
tree | d5bd99fc37ede2a0c6c28a11eb14b1b8347b9a88 /options/options.h | |
parent | b31a5e3a580c3245433a59767921e6766a302e8b (diff) | |
download | mpv-ae1aeab7aa2b7c378a9f734d227121f84ae85ed2.tar.bz2 mpv-ae1aeab7aa2b7c378a9f734d227121f84ae85ed2.tar.xz |
options: make decoder options local to decoder wrapper
Instead of having f_decoder_wrapper create its own copy of the entire
mpv option tree, create a struct local to that file and move all used
options to there.
movie_aspect is used by the "video-aspect" deprecated property code. I
think it's probably better not to remove the property yet, but
fortunately it's easy to work around without needing special handling
for this option or so.
correct_pts is used to prevent use of hr-seek in playloop.c. Ignore
that, if you use --no-correct-pts you're asking for trouble anyway. This
is the only behavior change.
Diffstat (limited to 'options/options.h')
-rw-r--r-- | options/options.h | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/options/options.h b/options/options.h index cf4025a20e..3a0663b6f8 100644 --- a/options/options.h +++ b/options/options.h @@ -172,12 +172,6 @@ typedef struct MPOpts { int cursor_autohide_delay; int cursor_autohide_fs; - int video_rotate; - - char *audio_decoders; - char *video_decoders; - char *audio_spdif; - struct mp_subtitle_opts *subs_rend; struct mp_sub_filter_opts *subs_filt; struct mp_osd_render_opts *osd_rend; @@ -207,7 +201,6 @@ typedef struct MPOpts { int use_filedir_conf; int hls_bitrate; int edition_id; - int correct_pts; int initial_audio_sync; int video_sync; double sync_max_video_change; @@ -266,8 +259,6 @@ typedef struct MPOpts { int prefetch_open; char *audio_demuxer_name; char *sub_demuxer_name; - int64_t video_reverse_size; - int64_t audio_reverse_size; int cache_pause; int cache_pause_initial; @@ -277,7 +268,6 @@ typedef struct MPOpts { char *screenshot_template; char *screenshot_directory; - double force_fps; int index_mode; struct m_channels audio_output_channels; @@ -288,10 +278,7 @@ typedef struct MPOpts { struct m_obj_settings *vf_settings, *vf_defs; struct m_obj_settings *af_settings, *af_defs; struct filter_opts *filter_opts; - float movie_aspect; - int aspect_method; - struct dec_queue_opts *vdec_queue_opts; - struct dec_queue_opts *adec_queue_opts; + struct dec_wrapper_opts *dec_wrapper; char **sub_name; char **sub_paths; char **audiofile_paths; @@ -375,8 +362,7 @@ extern const struct m_sub_options mp_osd_render_sub_opts; extern const struct m_sub_options filter_conf; extern const struct m_sub_options resample_conf; extern const struct m_sub_options stream_conf; -extern const struct m_sub_options vdec_queue_conf; -extern const struct m_sub_options adec_queue_conf; +extern const struct m_sub_options dec_wrapper_conf; extern const struct m_sub_options mp_opt_root; #endif |