X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg_filter.c;h=f550bd4a64b731a4bcee7baf04d5e3ffe5f16c5d;hb=1dd33d472a608daba459b628c170e89d796f1795;hp=db95c2f0cdb3893127d0322734b89b64756cf403;hpb=857d7194ca6d07fb9fa70c05826895d6b9c5e983;p=ffmpeg diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index db95c2f0cdb..f550bd4a64b 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -562,8 +562,10 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, if (!ist->framerate.num && ist->st->codec->ticks_per_frame>1) { AVRational codec_fr = av_inv_q(ist->st->codec->time_base); + AVRational avg_fr = ist->st->avg_frame_rate; codec_fr.den *= ist->st->codec->ticks_per_frame; - if(codec_fr.num>0 && codec_fr.den>0 && av_q2d(codec_fr) < av_q2d(fr)*0.7) + if ( codec_fr.num>0 && codec_fr.den>0 && av_q2d(codec_fr) < av_q2d(fr)*0.7 + && fabs(1.0 - av_q2d(av_div_q(avg_fr, fr)))>0.1) fr = codec_fr; }