Merge "CLPF: Don't assume sb size=64 and w&h multiple of 8 + valgrind fix." into nextgenv2

2016-10-11 17:44:12 +00:00
parent 3b161e14b3 f4d41e6330
commit b5e73bddb0
3 changed files with 7 additions and 7 deletions
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -4733,6 +4733,7 @@ static void encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size,

 #if CONFIG_CLPF
  aom_free(cm->clpf_blocks);
+  cm->clpf_blocks = 0;
 #endif

  if (cm->seg.update_map) update_reference_segmentation_map(cpi);