[FFmpeg-cvslog] fftools/ffmpeg: copy average framerate for streamcopy, when known

Anton Khirnov git at videolan.org
Thu Apr 8 12:01:44 EEST 2021


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon Apr  5 10:48:43 2021 +0200| [fa800d684fc0c08cc7f6698fdd8aa69eb76b011c] | committer: Anton Khirnov

fftools/ffmpeg: copy average framerate for streamcopy, when known

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

 fftools/ffmpeg.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 8e6206647f..3ad11452da 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -3144,7 +3144,11 @@ static int init_output_stream_streamcopy(OutputStream *ost)
 
     if (!ost->frame_rate.num)
         ost->frame_rate = ist->framerate;
-    ost->st->avg_frame_rate = ost->frame_rate;
+
+    if (ost->frame_rate.num)
+        ost->st->avg_frame_rate = ost->frame_rate;
+    else
+        ost->st->avg_frame_rate = ist->st->avg_frame_rate;
 
     ret = avformat_transfer_internal_stream_timing_info(of->ctx->oformat, ost->st, ist->st, copy_tb);
     if (ret < 0)



More information about the ffmpeg-cvslog mailing list