diff options
author | wm4 <wm4@nowhere> | 2018-02-01 09:20:25 +0100 |
---|---|---|
committer | Kevin Mitchell <kevmitch@gmail.com> | 2018-02-03 05:01:29 -0800 |
commit | 4f7a56e0c57af29cec84675cbad7ff3f91d696d0 (patch) | |
tree | 5e13174f3b75edd00ee2cd02fffc18ced0962b4e /player/command.c | |
parent | 7019e0dcfe9f6edddfe8b20f062f8bb94110b3a0 (diff) | |
download | mpv-4f7a56e0c57af29cec84675cbad7ff3f91d696d0.tar.bz2 mpv-4f7a56e0c57af29cec84675cbad7ff3f91d696d0.tar.xz |
video: fix passing down FPS to vf_vapoursynth
To make this less of a mess, remove one of the redundant container_fps
fields.
Part of #5470.
Diffstat (limited to 'player/command.c')
-rw-r--r-- | player/command.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/player/command.c b/player/command.c index 06c5e388ca..0ebdb29d96 100644 --- a/player/command.c +++ b/player/command.c @@ -2500,7 +2500,7 @@ static int get_frame_count(struct MPContext *mpctx) if (!mpctx->vo_chain) return -1; double len = get_time_length(mpctx); - double fps = mpctx->vo_chain->container_fps; + double fps = mpctx->vo_chain->filter->container_fps; if (len < 0 || fps <= 0) return 0; @@ -2949,7 +2949,7 @@ static int mp_property_fps(void *ctx, struct m_property *prop, int action, void *arg) { MPContext *mpctx = ctx; - float fps = mpctx->vo_chain ? mpctx->vo_chain->container_fps : 0; + float fps = mpctx->vo_chain ? mpctx->vo_chain->filter->container_fps : 0; if (fps < 0.1 || !isfinite(fps)) return M_PROPERTY_UNAVAILABLE;; return m_property_float_ro(action, arg, fps); |