diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2012-02-09 16:10:46 +0000 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2012-02-09 16:10:46 +0000 |
| commit | cf8af867dddc7830cf42577dd9bb27bf0330a682 (patch) | |
| tree | a9fd276314ad7e7705bfbc7466836da030e35a84 /vp8/common/pred_common.h | |
| parent | 8266abfe96cb1b46f537aec66b3dfcf22da2bb1c (diff) | |
| download | libvpx-cf8af867dddc7830cf42577dd9bb27bf0330a682.tar libvpx-cf8af867dddc7830cf42577dd9bb27bf0330a682.tar.gz libvpx-cf8af867dddc7830cf42577dd9bb27bf0330a682.tar.bz2 libvpx-cf8af867dddc7830cf42577dd9bb27bf0330a682.zip | |
Merge COMPRED
Merged in most of the current common prediction changes
that were under the #if CONFIG_COMPRED option.
Change-Id: If4e6f61dbe7b86dd449f6effbe93b5eb7e893885
Diffstat (limited to 'vp8/common/pred_common.h')
| -rw-r--r-- | vp8/common/pred_common.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/vp8/common/pred_common.h b/vp8/common/pred_common.h index 94a9ffe2d..2548dc9a6 100644 --- a/vp8/common/pred_common.h +++ b/vp8/common/pred_common.h @@ -20,11 +20,8 @@ typedef enum { PRED_SEG_ID = 0, // Segment identifier - -#if CONFIG_COMPRED PRED_REF = 1, PRED_DUAL = 2 -#endif } PRED_ID; @@ -47,11 +44,8 @@ extern void set_pred_flag( MACROBLOCKD *const xd, extern unsigned char get_pred_mb_segid( VP8_COMMON *const cm, int MbIndex ); -#if CONFIG_COMPRED extern MV_REFERENCE_FRAME get_pred_ref( VP8_COMMON *const cm, MACROBLOCKD *const xd ); extern void compute_mod_refprobs( VP8_COMMON *const cm ); -#endif - #endif /* __INC_PRED_COMMON_H__ */ |