[FFmpeg-cvslog] ffmpeg: Fix division by 0 due to invalid timebase

Michael Niedermayer git at videolan.org
Tue Feb 28 19:05:37 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 28 18:41:01 2012 +0100| [ddd86a2924b9bc67c406cd66ebb1fc8915cd60f7] | committer: Michael Niedermayer

ffmpeg: Fix division by 0 due to invalid timebase

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 ffmpeg.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 4bdca88..06fb253 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2269,7 +2269,7 @@ static int output_packet(InputStream *ist,
             ret = transcode_video    (ist, &avpkt, &got_output, &pkt_pts);
             if (avpkt.duration) {
                 duration = av_rescale_q(avpkt.duration, ist->st->time_base, AV_TIME_BASE_Q);
-            } else if(ist->st->codec->time_base.num != 0) {
+            } else if(ist->st->codec->time_base.num != 0 && ist->st->codec->time_base.den != 0) {
                 int ticks= ist->st->parser ? ist->st->parser->repeat_pict+1 : ist->st->codec->ticks_per_frame;
                 duration = ((int64_t)AV_TIME_BASE *
                                 ist->st->codec->time_base.num * ticks) /



More information about the ffmpeg-cvslog mailing list