video: don't overwrite demuxer FPS value

If the --fps option was given (MPOpts->force_fps), the demuxer FPS value
was overwritten with the forced value. This was fine, since the demuxer
value wasn't needed anymore. But with the recent changes not to write to
the demuxer stream headers, we don't want to do this anymore. So
maintain the (forced/updated) FPS value in dec_video->fps.

The removed code in loadfile.c is probably redundant, and an artifact
from past refactorings.

Note that sub.c will now always use the demuxer FPS value, instead of
the user override value. I think this is fine, because it used the
demuxer's video size values too. (And it's rare that these values are
used at all.)

1 files changed, 1 insertions, 1 deletions

diff --git a/mpvcore/player/command.c b/mpvcore/player/command.c
index d3d99c4b02..c2433106ac 100644
--- a/mpvcore/player/command.c
+++ b/mpvcore/player/command.c
@@ -1534,7 +1534,7 @@ static int mp_property_fps(m_option_t *prop, int action, void *arg,
 {
     if (!mpctx->d_video)
         return M_PROPERTY_UNAVAILABLE;
-    return m_property_float_ro(prop, action, arg, mpctx->d_video->header->video->fps);
+    return m_property_float_ro(prop, action, arg, mpctx->d_video->fps);
 }
 
 /// Video aspect (RO)