[FFmpeg-cvslog] ffmpeg.c: fix calculation of input file duration in seek_to_start()

Peter Große git at videolan.org
Sun Nov 5 05:00:10 EET 2017


ffmpeg | branch: master | Peter Große <pegro at friiks.de> | Sun Oct 29 12:08:05 2017 +0100| [3ddb887c88483ce089b29a30d0d0aa574c8cdc66] | committer: Michael Niedermayer

ffmpeg.c: fix calculation of input file duration in seek_to_start()

Fixes looping files without audio or when using stream_copy, where
ist->nb_samples is not set since no decoding is done.

This fixes ticket #5719 and also fixes an endless loop with the sample
in ticket #6139.

Signed-off-by: Peter Große <pegro at friiks.de>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 fftools/ffmpeg.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 286d898b12..65dbe93626 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -4150,9 +4150,9 @@ static int seek_to_start(InputFile *ifile, AVFormatContext *is)
                 continue;
         } else {
             if (ist->framerate.num) {
-                duration = av_rescale_q(1, ist->framerate, ist->st->time_base);
+                duration = av_rescale_q(1, av_inv_q(ist->framerate), ist->st->time_base);
             } else if (ist->st->avg_frame_rate.num) {
-                duration = av_rescale_q(1, ist->st->avg_frame_rate, ist->st->time_base);
+                duration = av_rescale_q(1, av_inv_q(ist->st->avg_frame_rate), ist->st->time_base);
             } else duration = 1;
         }
         if (!ifile->duration)



More information about the ffmpeg-cvslog mailing list