diff options
author | John Koleszar <jkoleszar@google.com> | 2011-03-05 00:05:05 -0500 |
---|---|---|
committer | John Koleszar <jkoleszar@google.com> | 2011-03-05 00:05:05 -0500 |
commit | 89d66cbb203990b19a27b0f09753f479400e1c25 (patch) | |
tree | c3cccf4e48db182f036dc32e23baf5d2b00d394e /vp8/encoder/onyx_if.c | |
parent | 153805ffab249f55f4461a5aada281d212db03ba (diff) | |
parent | 3fae3283e6037a0b20f5e32402ba8e50d7ef859e (diff) | |
download | libvpx-89d66cbb203990b19a27b0f09753f479400e1c25.tar libvpx-89d66cbb203990b19a27b0f09753f479400e1c25.tar.gz libvpx-89d66cbb203990b19a27b0f09753f479400e1c25.tar.bz2 libvpx-89d66cbb203990b19a27b0f09753f479400e1c25.zip |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/encoder/onyx_if.c')
-rw-r--r-- | vp8/encoder/onyx_if.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 0d471cd28..ea2f00bed 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -5304,9 +5304,12 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon { long long nanosecs = cpi->source_end_time_stamp - cpi->last_end_time_stamp_seen; - double this_fps = 10000000.000 / nanosecs; - vp8_new_frame_rate(cpi, (7 * cpi->oxcf.frame_rate + this_fps) / 8); + if (nanosecs > 0) + { + double this_fps = 10000000.000 / nanosecs; + vp8_new_frame_rate(cpi, (7 * cpi->oxcf.frame_rate + this_fps) / 8); + } } |