diff options
Diffstat (limited to 'options')
| -rw-r--r-- | options/options.c | 13 | ||||
| -rw-r--r-- | options/options.h | 3 |
2 files changed, 10 insertions, 6 deletions
diff --git a/options/options.c b/options/options.c index 791f5beeb5..ac7d706222 100644 --- a/options/options.c +++ b/options/options.c @@ -86,6 +86,7 @@ const struct m_opt_choice_alternatives mp_hwdec_names[] = { {"videotoolbox",HWDEC_VIDEOTOOLBOX}, {"vaapi", HWDEC_VAAPI}, {"vaapi-copy", HWDEC_VAAPI_COPY}, + {"dxva2", HWDEC_DXVA2}, {"dxva2-copy", HWDEC_DXVA2_COPY}, {"rpi", HWDEC_RPI}, {0} @@ -226,6 +227,8 @@ const m_option_t mp_opts[] = { OPT_STRINGLIST("alang", stream_lang[STREAM_AUDIO], 0), OPT_STRINGLIST("slang", stream_lang[STREAM_SUB], 0), + OPT_STRING("lavfi-complex", lavfi_complex, 0), + OPT_CHOICE("audio-display", audio_display, 0, ({"no", 0}, {"attachment", 1})), @@ -274,6 +277,7 @@ const m_option_t mp_opts[] = { OPT_INTRANGE("audio-samplerate", force_srate, 0, 1000, 16*48000), OPT_CHMAP("audio-channels", audio_output_channels, CONF_MIN, .min = 0), OPT_AUDIOFORMAT("audio-format", audio_output_format, 0), + OPT_FLAG("audio-normalize-downmix", audio_normalize, 0), OPT_DOUBLE("speed", playback_speed, M_OPT_RANGE | M_OPT_FIXED, .min = 0.01, .max = 100.0), @@ -333,6 +337,7 @@ const m_option_t mp_opts[] = { OPT_STRING_APPEND_LIST("sub-file", sub_name, M_OPT_FILE), OPT_PATHLIST("sub-paths", sub_paths, 0), OPT_PATHLIST("audio-file-paths", audiofile_paths, 0), + OPT_STRING_APPEND_LIST("external-file", external_files, M_OPT_FILE), OPT_STRING("sub-codepage", sub_cp, 0), OPT_FLOAT("sub-delay", sub_delay, 0), OPT_FLOAT("sub-fps", sub_fps, 0), @@ -679,7 +684,7 @@ const struct MPOpts mp_default_opts = { .use_terminal = 1, .msg_color = 1, .audio_driver_list = NULL, - .audio_decoders = "lavc:libdcadec,-spdif:*", // never select spdif by default + .audio_decoders = "-spdif:*", // never select spdif by default .video_decoders = NULL, .deinterlace = -1, .softvol = SOFTVOL_AUTO, @@ -787,7 +792,7 @@ const struct MPOpts mp_default_opts = { .sub_visibility = 1, .sub_pos = 100, .sub_speed = 1.0, - .audio_output_channels = {0}, // auto + .audio_output_channels = MP_CHMAP_INIT_STEREO, .audio_output_format = 0, // AF_FORMAT_UNKNOWN .playback_speed = 1., .pitch_correction = 1, @@ -819,10 +824,6 @@ const struct MPOpts mp_default_opts = { .mf_fps = 1.0, -#if HAVE_RPI - .hwdec_api = -1, -#endif - .display_tags = (char **)(const char*[]){ "Artist", "Album", "Album_Artist", "Comment", "Composer", "Genre", "Performer", "Title", "Track", "icy-title", "service_name", diff --git a/options/options.h b/options/options.h index ea3ee00b30..95268cd522 100644 --- a/options/options.h +++ b/options/options.h @@ -186,6 +186,7 @@ typedef struct MPOpts { int ignore_path_in_watch_later_config; int pause; int keep_open; + char *lavfi_complex; int stream_id[2][STREAM_TYPE_COUNT]; int stream_id_ff[STREAM_TYPE_COUNT]; char **stream_lang[STREAM_TYPE_COUNT]; @@ -225,6 +226,7 @@ typedef struct MPOpts { struct mp_chmap audio_output_channels; int audio_output_format; + int audio_normalize; int force_srate; int dtshd; double playback_speed; @@ -238,6 +240,7 @@ typedef struct MPOpts { char **sub_name; char **sub_paths; char **audiofile_paths; + char **external_files; int sub_auto; int audiofile_auto; int osd_bar_visible; |