[FFmpeg-cvslog] avconv: prefer user-forced input framerate when choosing output framerate

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Fri Aug 24 17:42:46 2012 +0200| [44b0b85fe97b7197b8af80a6251ace6e732083c6] | committer: Anton Khirnov

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44b0b85fe97b7197b8af80a6251ace6e732083c6
---

 avconv.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/avconv.c b/avconv.c
index 735fc3e..592e9a8 100644
--- a/avconv.c
+++ b/avconv.c
@@ -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];