ref: d13820b94944412b2161b4de3624ad9467dbe0f0
parent: c217423af908648d10e43c6210ae614ee474533e
parent: 5510e379308a103c3ce54dff0b4d1f8e398bff25
author: Marco Paniconi <[email protected]>
date: Mon Mar 24 06:54:52 EDT 2014
Merge "Fix to a static warning."
--- a/vp9/encoder/vp9_aq_cyclicrefresh.c
+++ b/vp9/encoder/vp9_aq_cyclicrefresh.c
@@ -150,7 +150,7 @@
int qindex_delta = 0;
int mbs_in_frame = cm->mi_rows * cm->mi_cols;
int i, x, y, block_count, bl_index, bl_index2;
- int sum_map, new_value, mi_row, mi_col, xmis, ymis, qindex2;
+ int sum_map, mi_row, mi_col, xmis, ymis, qindex2;
// Rate target ratio to set q delta.
float rate_ratio_qdelta = 2.0;
@@ -249,9 +249,9 @@
bl_index2 = bl_index + y * cm->mi_cols + x;
sum_map += seg_map[bl_index2];
}
- new_value = 0;
// If segment is partial over superblock, reset.
if (sum_map > 0 && sum_map < xmis * ymis) {
+ int new_value;
if (sum_map < xmis * ymis / 2)
new_value = 0;
else