summaryrefslogtreecommitdiffstats
path: root/filters/f_output_chain.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-04-19 17:42:14 +0200
committerwm4 <wm4@nowhere>2018-04-19 23:22:48 +0200
commitff24285eb15676dc7519b858be01a1def155e847 (patch)
treeda962345d8d33108c0b096c3aaeec6cbc41fe25c /filters/f_output_chain.c
parente7e06a47a0b5626c3abe81f3627d10ed58d92d3b (diff)
downloadmpv-ff24285eb15676dc7519b858be01a1def155e847.tar.bz2
mpv-ff24285eb15676dc7519b858be01a1def155e847.tar.xz
video: pass through container fps to filters
This means vf_vapoursynth doesn't need a hack to work around the filter code, and libavfilter filters now actually get the frame_rate field on input pads set. The libavfilter doxygen says the frame_rate field is only to be set if the frame rate is known to be constant, and uses the word "must" (which probably means they really mean it?) - but ffmpeg.c sets the field to mere guesses anyway, and it looks like this normally won't lead to problems.
Diffstat (limited to 'filters/f_output_chain.c')
-rw-r--r--filters/f_output_chain.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/filters/f_output_chain.c b/filters/f_output_chain.c
index e986614e9d..cd577a6ca2 100644
--- a/filters/f_output_chain.c
+++ b/filters/f_output_chain.c
@@ -357,12 +357,6 @@ static double get_display_fps(struct mp_stream_info *i)
return res;
}
-static double get_container_fps(struct mp_stream_info *i)
-{
- struct chain *p = i->priv;
- return p->public.container_fps;
-}
-
void mp_output_chain_set_vo(struct mp_output_chain *c, struct vo *vo)
{
struct chain *p = c->f->priv;
@@ -650,7 +644,6 @@ static void create_video_things(struct chain *p)
p->stream_info.priv = p;
p->stream_info.get_display_fps = get_display_fps;
- p->stream_info.get_container_fps = get_container_fps;
p->f->stream_info = &p->stream_info;