From 48ff6683ba5d40b629428673b1028e8ec542a9fa Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Tue, 3 Nov 2015 09:57:17 -0800 Subject: lavfi: add a frame_rate field to AVFilterLink. (cherry picked from ffmpeg commit 7b42036b3b23c85f473bf9369e37fa8da22eaf93) Signed-off-by: Anton Khirnov --- libavfilter/avfilter.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libavfilter/avfilter.c') diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 64b26457f5..cd98d16220 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -195,6 +195,8 @@ int avfilter_config_links(AVFilterContext *filter) link->src->inputs[0]->sample_aspect_ratio : (AVRational){1,1}; if (link->src->nb_inputs) { + if (!link->frame_rate.num && !link->frame_rate.den) + link->frame_rate = link->src->inputs[0]->frame_rate; if (!link->w) link->w = link->src->inputs[0]->w; if (!link->h) -- cgit v1.2.3