summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2005-09-20 10:50:22 +0000
committerWim Taymans <wim.taymans@gmail.com>2005-09-20 10:50:22 +0000
commit00aa9d5fba07479d909e0b6249777b07cb83e6fc (patch)
tree0b764e5376bb4e9dcfdbdd93c256c6f27a3cce91
parentf9a174c86e75104319e2901aabf61e497e81cb4e (diff)
downloadgst-libav-00aa9d5fba07479d909e0b6249777b07cb83e6fc.tar.gz
ext/ffmpeg/gstffmpegcodecmap.h: Avoid division by 0 errors.
Original commit message from CVS: * ext/ffmpeg/gstffmpegcodecmap.h: Avoid division by 0 errors.
-rw-r--r--ChangeLog5
m---------common0
-rw-r--r--ext/ffmpeg/gstffmpegcodecmap.h2
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index eaacd1b..150457a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-20 Wim Taymans <wim@fluendo.com>
+
+ * ext/ffmpeg/gstffmpegcodecmap.h:
+ Avoid division by 0 errors.
+
2005-09-19 Wim Taymans <wim@fluendo.com>
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_setcaps),
diff --git a/common b/common
-Subproject eac450a673cd1d3a606fe75399d0cd1fcb1d0d7
+Subproject cd4da6a319d9f92d28f7b8a3b412577e6de50b6
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 };