From 9984a155d6bb7b81bbe2260e0f5807208fa103e2 Mon Sep 17 00:00:00 2001 From: Deb Mukherjee Date: Fri, 27 Jul 2012 11:29:46 -0700 Subject: Merges several experiments The following five experiments are merged: newentropy newupdate adaptive_entropy (also includes a couple of parameter changes that improves results a little in common/entropymode.c and encoder/modecosts.c that were not merged from the internal branch) newintramodes expanded_coef_context Change-Id: I8a142a831786ee9dc936f22be1d42a8bced7d270 --- vp8/common/reconintra.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'vp8/common/reconintra.h') diff --git a/vp8/common/reconintra.h b/vp8/common/reconintra.h index 03b50f2c1..131434386 100644 --- a/vp8/common/reconintra.h +++ b/vp8/common/reconintra.h @@ -13,7 +13,6 @@ #define __INC_RECONINTRA_H #include "blockd.h" -#if CONFIG_NEWINTRAMODES void d45_predictor(unsigned char *ypred_ptr, int y_stride, int n, unsigned char *yabove_row, unsigned char *yleft_col); void d135_predictor(unsigned char *ypred_ptr, int y_stride, int n, @@ -26,7 +25,6 @@ void d27_predictor(unsigned char *ypred_ptr, int y_stride, int n, unsigned char *yabove_row, unsigned char *yleft_col); void d64_predictor(unsigned char *ypred_ptr, int y_stride, int n, unsigned char *yabove_row, unsigned char *yleft_col); -#endif /* CONFIG_NEWINTRAMODES */ extern void init_intra_left_above_pixels(MACROBLOCKD *x); -- cgit v1.2.3