From 11b8cbcce7efd02bee5c7427a4fa157bf20199e4 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 22 Oct 2016 15:33:20 +0200 Subject: 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. --- player/command.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/player/command.c b/player/command.c index 1fa4695a91..0d5106227c 100644 --- a/player/command.c +++ b/player/command.c @@ -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 }; -- cgit v1.2.3