Merge "firstpass.c: fix an UBSAN/IOC error"

100dfc9e · Yaowu Xu · Gerrit Code Review · bacc67f4 · fd500f95 · 100dfc9e
Commit 100dfc9e authored Jun 02, 2016 by Yaowu Xu Committed by Gerrit Code Review Jun 02, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

vp8/encoder/firstpass.c vp8/encoder/firstpass.c +2 -1

No files found.
--- a/vp8/encoder/firstpass.c
+++ b/vp8/encoder/firstpass.c
@@ -2808,7 +2808,8 @@ static void find_next_key_frame(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
             * static scene.
             */
            if ( detect_transition_to_still( cpi, i,
-                                             (cpi->key_frame_frequency-i),
+                                             ((int)(cpi->key_frame_frequency) -
+                                              (int)i),
                                             loop_decay_rate,
                                             decay_accumulator ) )
            {