mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-19 05:49:09 +02:00
avformat/util: Simplify av_guess_frame_rate() by using AVCodecContext.framerate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
004f1c6cf1
commit
d267a0f8c1
@ -4104,7 +4104,7 @@ AVRational av_guess_sample_aspect_ratio(AVFormatContext *format, AVStream *strea
|
||||
AVRational av_guess_frame_rate(AVFormatContext *format, AVStream *st, AVFrame *frame)
|
||||
{
|
||||
AVRational fr = st->r_frame_rate;
|
||||
AVRational codec_fr = av_inv_q(st->codec->time_base);
|
||||
AVRational codec_fr = st->codec->framerate;
|
||||
AVRational avg_fr = st->avg_frame_rate;
|
||||
|
||||
if (avg_fr.num > 0 && avg_fr.den > 0 && fr.num > 0 && fr.den > 0 &&
|
||||
@ -4114,7 +4114,6 @@ AVRational av_guess_frame_rate(AVFormatContext *format, AVStream *st, AVFrame *f
|
||||
|
||||
|
||||
if (st->codec->ticks_per_frame > 1) {
|
||||
codec_fr.den *= 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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user