diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-27 22:08:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-29 17:40:28 +0100 |
| commit | ef7b6b489ab38a8f0abe6b8f55c0e130cbd125c9 (patch) | |
| tree | b3a0892c9a4d1bf7406a22379144861b8fc5d34e /ffmpeg_filter.c | |
| parent | c81d2fa96ddc9f6dab38d61a8803caca7e63bea0 (diff) | |
| download | ffmpeg-ef7b6b489ab38a8f0abe6b8f55c0e130cbd125c9.tar.gz | |
ffmpeg/avformat: factor av_guess_frame_rate() out
This will be used in ffplay
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
| -rw-r--r-- | ffmpeg_filter.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index 654c19d4c3..6824af6dee 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -542,22 +542,15 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, InputStream *ist = ifilter->ist; AVRational tb = ist->framerate.num ? av_inv_q(ist->framerate) : ist->st->time_base; - AVRational fr = ist->framerate.num ? ist->framerate : - ist->st->r_frame_rate; + AVRational fr = ist->framerate; AVRational sar; AVBPrint args; char name[255]; int pad_idx = in->pad_idx; int ret; - 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 - && fabs(1.0 - av_q2d(av_div_q(avg_fr, fr)))>0.1) - fr = codec_fr; - } + if (!fr.num) + fr = av_guess_frame_rate(input_files[ist->file_index]->ctx, ist->st, NULL); if (ist->st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) { ret = sub2video_prepare(ist); |