diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-29 19:08:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-29 19:23:22 +0200 |
| commit | 42043646785f419def5ca557f500ee105f4ccb3c (patch) | |
| tree | 2300789f687effdb7d7302255ff643e23e8ef228 | |
| parent | 282ec7289d669e0297ad19ea492e086720e1bdcb (diff) | |
| download | ffmpeg-42043646785f419def5ca557f500ee105f4ccb3c.tar.gz | |
ffmpeg: switch duration calculation code from avg to r frame_rate.
This heuristic is less likely to overshoot and cause encoder failure.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffmpeg.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1570,7 +1570,9 @@ static void do_video_out(AVFormatContext *s, OutputStream *ost, if (ist->st->start_time != AV_NOPTS_VALUE && ist->st->first_dts != AV_NOPTS_VALUE) { duration = FFMAX(av_q2d(ist->st->time_base), av_q2d(ist->st->codec->time_base)); - if(ist->st->avg_frame_rate.num) + if(ist->st->r_frame_rate.num) + duration= FFMAX(duration, 1/av_q2d(ist->st->r_frame_rate)); + if(ist->st->avg_frame_rate.num && 0) duration= FFMAX(duration, 1/av_q2d(ist->st->avg_frame_rate)); duration /= av_q2d(enc->time_base); |