From 00aa9d5fba07479d909e0b6249777b07cb83e6fc Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 20 Sep 2005 10:50:22 +0000 Subject: [PATCH] ext/ffmpeg/gstffmpegcodecmap.h: Avoid division by 0 errors. Original commit message from CVS: * ext/ffmpeg/gstffmpegcodecmap.h: Avoid division by 0 errors. --- ChangeLog | 5 +++++ common | 2 +- ext/ffmpeg/gstffmpegcodecmap.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index eaacd1b..150457a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-09-20 Wim Taymans + + * ext/ffmpeg/gstffmpegcodecmap.h: + Avoid division by 0 errors. + 2005-09-19 Wim Taymans * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_setcaps), diff --git a/common b/common index eac450a..cd4da6a 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit eac450a673cd1d3a606fe75399d0cd1fcb1d0d7b +Subproject commit cd4da6a319d9f92d28f7b8a3b412577e6de50b64 diff --git a/ext/ffmpeg/gstffmpegcodecmap.h b/ext/ffmpeg/gstffmpegcodecmap.h index e8e3aa0..9d884d1 100644 --- a/ext/ffmpeg/gstffmpegcodecmap.h +++ b/ext/ffmpeg/gstffmpegcodecmap.h @@ -155,7 +155,7 @@ gst_ffmpeg_time_gst_to_ff (guint64 time, AVRational base) { gint64 out; - if (!GST_CLOCK_TIME_IS_VALID (time)) { + if (!GST_CLOCK_TIME_IS_VALID (time) || base.num == 0) { out = AV_NOPTS_VALUE; } else { AVRational bq = { 1, GST_SECOND }; -- 2.7.4