ref: edcf74c6add3b64fe7bd931194bcb9ebbfa3413a
parent: d6d5d43708cac5b5002a26d10782ec65d710dcf9
author: Jim Bankoski <jimbankoski@google.com>
date: Tue Jan 18 06:14:17 EST 2011
vp8e -removed undefined max call Change-Id: I42a86b0488f44115f09551fc5ad6d711fd470f0d
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -1503,7 +1503,10 @@
cpi->min_frame_bandwidth = (int)(cpi->av_per_frame_bandwidth * cpi->oxcf.two_pass_vbrmin_section / 100);
// Set Maximum gf/arf interval
- cpi->max_gf_interval = max(((int)(cpi->output_frame_rate / 2.0) + 2), 12);
+ cpi->max_gf_interval = ((int)(cpi->output_frame_rate / 2.0) + 2);
+
+ if(cpi->max_gf_interval < 12)
+ cpi->max_gf_interval = 12;
// Extended interval for genuinely static scenes
cpi->static_scene_max_gf_interval = cpi->key_frame_frequency >> 1;