diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-09 20:15:03 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-09 20:24:15 +0400 |
commit | a54867121d015cc8fe71eff40ddcf0e16d42f178 (patch) | |
tree | d3b3b0f53ca7fa3d29de9f8a1b61a4a5be9ce376 /ffmpeg.c | |
parent | 1ca37e79d0466ede39d6ed47b22f6912fe28798c (diff) |
ffmpeg: fix frame duration used for video sync.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 11 |
1 files changed, 2 insertions, 9 deletions
@@ -1909,15 +1909,8 @@ static void do_video_out(AVFormatContext *s, OutputStream *ost, enc = ost->st->codec; - if (ist && 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->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); - } + if(ist && ist->st->start_time != AV_NOPTS_VALUE && ist->st->first_dts != AV_NOPTS_VALUE && ost->frame_rate.num) + duration = 1/(av_q2d(ost->frame_rate) * av_q2d(enc->time_base)); sync_ipts = get_sync_ipts(ost, in_picture->pts) / av_q2d(enc->time_base); delta = sync_ipts - ost->sync_opts + duration; |