1
0
mirror of https://github.com/mpv-player/mpv synced 2025-04-10 11:41:37 +00:00

command: fix reset-on-next-file=all and tv-freq option

The tv-freq options and properties use different types, thus must be
treated as incompatible. Fixes an assertion with reset-on-next-file=all,
which tries to set the option.

Fixes #3708.
This commit is contained in:
wm4 2016-10-22 15:33:20 +02:00
parent 082340b467
commit 11b8cbcce7

View File

@ -287,10 +287,11 @@ int mp_on_set_option(void *ctx, struct m_config_option *co, void *data, int flag
// OK, is handled separately: playlist
// OK, does not conflict on low level: audio-file, sub-file, external-file
// OK, different value ranges, but happens to work for now: volume, edition
// Incompatible: tv-freq
// All the other properties are deprecated in their current form.
static const char *const no_property[] = {
"demuxer", "idle", "length", "audio-samplerate", "audio-channels",
"audio-format", "fps", "cache", "playlist-pos", "chapter",
"audio-format", "fps", "cache", "playlist-pos", "chapter", "tv-freq",
NULL
};