diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-07-27 11:29:46 -0700 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2012-07-27 12:12:39 -0700 |
| commit | 9984a155d6bb7b81bbe2260e0f5807208fa103e2 (patch) | |
| tree | 2918641823325be67304c719165ab25f982ad5e8 /vp8/common/reconintra.h | |
| parent | 10a492847f2af49eb8842b17658c5063fae3689b (diff) | |
| download | libvpx-9984a155d6bb7b81bbe2260e0f5807208fa103e2.tar libvpx-9984a155d6bb7b81bbe2260e0f5807208fa103e2.tar.gz libvpx-9984a155d6bb7b81bbe2260e0f5807208fa103e2.tar.bz2 libvpx-9984a155d6bb7b81bbe2260e0f5807208fa103e2.zip | |
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
Diffstat (limited to 'vp8/common/reconintra.h')
| -rw-r--r-- | vp8/common/reconintra.h | 2 |
1 files changed, 0 insertions, 2 deletions
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); |