From edcf74c6add3b64fe7bd931194bcb9ebbfa3413a Mon Sep 17 00:00:00 2001 From: Jim Bankoski Date: Tue, 18 Jan 2011 11:14:17 -0500 Subject: [PATCH] vp8e -removed undefined max call Change-Id: I42a86b0488f44115f09551fc5ad6d711fd470f0d --- vp8/encoder/onyx_if.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 4f0be78fe..77fbb29b1 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -1503,7 +1503,10 @@ void vp8_new_frame_rate(VP8_COMP *cpi, double framerate) 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; -- 2.50.1