vp8e -removed undefined max call

Change-Id: I42a86b0488f44115f09551fc5ad6d711fd470f0d

vp8e -removed undefined max call
Change-Id: I42a86b0488f44115f09551fc5ad6d711fd470f0d
edcf74c6 · Jim Bankoski · d6d5d437 · edcf74c6
Commit edcf74c6 authored Jan 18, 2011 by Jim Bankoski
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

vp8/encoder/onyx_if.c vp8/encoder/onyx_if.c +4 -1

No files found.
--- 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;