From 1b8f4d773c4d3bfcff9cdbc26200afbbaa445bc3 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 15 Oct 2012 00:14:43 +0200 Subject: ffmpeg: use framerate not fieldrate as filter input. Fixes a problem described in Ticket1065 Signed-off-by: Michael Niedermayer --- ffmpeg_filter.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index 436cdf27d2..d0f25d82ad 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -558,6 +558,13 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, int pad_idx = in->pad_idx; int ret; + if (!ist->framerate.num) { + AVRational codec_fr = av_inv_q(ist->st->codec->time_base); + codec_fr.den *= ist->st->codec->ticks_per_frame; + if(av_q2d(codec_fr) < av_q2d(fr)*0.7) + fr = codec_fr; + } + if (ist->st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) { ret = sub2video_prepare(ist); if (ret < 0) -- cgit v1.2.3