diff options
| author | Johann <johannkoenig@google.com> | 2012-05-23 16:08:37 -0700 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2012-06-04 16:56:55 -0700 |
| commit | 965d8686bb2c192b2f1a1b3e6c4e5aca12d623a4 (patch) | |
| tree | ab4723722aec2b55f1bfa8a23fea36c27a506173 /vp8/encoder/rdopt.h | |
| parent | 2b10528adcc6586793b42ea7ed7e2f523895be9b (diff) | |
| download | libvpx-965d8686bb2c192b2f1a1b3e6c4e5aca12d623a4.tar libvpx-965d8686bb2c192b2f1a1b3e6c4e5aca12d623a4.tar.gz libvpx-965d8686bb2c192b2f1a1b3e6c4e5aca12d623a4.tar.bz2 libvpx-965d8686bb2c192b2f1a1b3e6c4e5aca12d623a4.zip | |
Remove extra enum
VP8_REFFRAME is the same as vpx_ref_frame_type
Change-Id: I63c2ddfb39f6ec87d1e5eb6a8852846464552b1b
Diffstat (limited to 'vp8/encoder/rdopt.h')
| -rw-r--r-- | vp8/encoder/rdopt.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vp8/encoder/rdopt.h b/vp8/encoder/rdopt.h index db939f96c..bbcb59f67 100644 --- a/vp8/encoder/rdopt.h +++ b/vp8/encoder/rdopt.h @@ -86,15 +86,15 @@ static void get_predictor_pointers(const VP8_COMP *cpi, unsigned int recon_yoffset, unsigned int recon_uvoffset) { - if (cpi->ref_frame_flags & VP8_LAST_FLAG) + if (cpi->ref_frame_flags & VP8_LAST_FRAME) get_plane_pointers(&cpi->common.yv12_fb[cpi->common.lst_fb_idx], plane[LAST_FRAME], recon_yoffset, recon_uvoffset); - if (cpi->ref_frame_flags & VP8_GOLD_FLAG) + if (cpi->ref_frame_flags & VP8_GOLD_FRAME) get_plane_pointers(&cpi->common.yv12_fb[cpi->common.gld_fb_idx], plane[GOLDEN_FRAME], recon_yoffset, recon_uvoffset); - if (cpi->ref_frame_flags & VP8_ALT_FLAG) + if (cpi->ref_frame_flags & VP8_ALTR_FRAME) get_plane_pointers(&cpi->common.yv12_fb[cpi->common.alt_fb_idx], plane[ALTREF_FRAME], recon_yoffset, recon_uvoffset); } @@ -106,11 +106,11 @@ static void get_reference_search_order(const VP8_COMP *cpi, int i=0; ref_frame_map[i++] = INTRA_FRAME; - if (cpi->ref_frame_flags & VP8_LAST_FLAG) + if (cpi->ref_frame_flags & VP8_LAST_FRAME) ref_frame_map[i++] = LAST_FRAME; - if (cpi->ref_frame_flags & VP8_GOLD_FLAG) + if (cpi->ref_frame_flags & VP8_GOLD_FRAME) ref_frame_map[i++] = GOLDEN_FRAME; - if (cpi->ref_frame_flags & VP8_ALT_FLAG) + if (cpi->ref_frame_flags & VP8_ALTR_FRAME) ref_frame_map[i++] = ALTREF_FRAME; for(; i<4; i++) ref_frame_map[i] = -1; |