projects
/
profile
/
ivi
/
libvpx.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1f32b14
)
Fix duplicate vp8_compute_frame_size_bounds
author
John Koleszar
<jkoleszar@google.com>
Mon, 25 Apr 2011 18:30:57 +0000
(14:30 -0400)
committer
John Koleszar
<jkoleszar@google.com>
Mon, 25 Apr 2011 18:30:57 +0000
(14:30 -0400)
Likely introduced by a bad automatic merge from gerrit.
Change-Id: I0c6dd6ec18809cf9492f524d283fa4a3a8f4088b
vp8/encoder/ratectrl.c
patch
|
blob
|
history
diff --git
a/vp8/encoder/ratectrl.c
b/vp8/encoder/ratectrl.c
index
7903df7
..
09a69bc
100644
(file)
--- 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: