From: John Koleszar Date: Mon, 25 Apr 2011 18:30:57 +0000 (-0400) Subject: Fix duplicate vp8_compute_frame_size_bounds X-Git-Tag: v0.9.7~193 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd6da3b2e7992fb99d6486feb5593bc3de344614;p=libvpx Fix duplicate vp8_compute_frame_size_bounds Likely introduced by a bad automatic merge from gerrit. Change-Id: I0c6dd6ec18809cf9492f524d283fa4a3a8f4088b --- diff --git a/vp8/encoder/ratectrl.c b/vp8/encoder/ratectrl.c index 7903df7da..09a69bc71 100644 --- a/vp8/encoder/ratectrl.c +++ b/vp8/encoder/ratectrl.c @@ -1502,7 +1502,7 @@ void vp8_adjust_key_frame_context(VP8_COMP *cpi) cpi->key_frame_count++; } -void vp8_compute_frame_size_bounds(VP8_COMP *cpi, int *frame_under_shoot_limit, int *frame_over_shoot_limit) + void vp8_compute_frame_size_bounds(VP8_COMP *cpi, int *frame_under_shoot_limit, int *frame_over_shoot_limit) { // Set-up bounds on acceptable frame size: