Commit 44b0b85f authored by Anton Khirnov's avatar Anton Khirnov

avconv: prefer user-forced input framerate when choosing output framerate

parent db707302
......@@ -1682,7 +1682,11 @@ static int transcode_init(void)
(video_sync_method == VSYNC_CFR ||
(video_sync_method == VSYNC_AUTO &&
!(oc->oformat->flags & (AVFMT_NOTIMESTAMPS | AVFMT_VARIABLE_FPS))))) {
ost->frame_rate = ist->st->avg_frame_rate.num ? ist->st->avg_frame_rate : (AVRational){25, 1};
ost->frame_rate = ist->framerate.num ? ist->framerate :
ist->st->avg_frame_rate.num ?
ist->st->avg_frame_rate :
(AVRational){25, 1};
if (ost->enc && ost->enc->supported_framerates && !ost->force_fps) {
int idx = av_find_nearest_q_idx(ost->frame_rate, ost->enc->supported_framerates);
ost->frame_rate = ost->enc->supported_framerates[idx];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment