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/decoder/onyxd_if.c | |
| 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/decoder/onyxd_if.c')
| -rw-r--r-- | vp8/decoder/onyxd_if.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vp8/decoder/onyxd_if.c b/vp8/decoder/onyxd_if.c index e9d1a560f..1c67e71d7 100644 --- a/vp8/decoder/onyxd_if.c +++ b/vp8/decoder/onyxd_if.c @@ -125,16 +125,16 @@ void vp8dx_remove_decompressor(VP8D_COMP *pbi) } -vpx_codec_err_t vp8dx_get_reference(VP8D_COMP *pbi, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd) +vpx_codec_err_t vp8dx_get_reference(VP8D_COMP *pbi, enum vpx_ref_frame_type ref_frame_flag, YV12_BUFFER_CONFIG *sd) { VP8_COMMON *cm = &pbi->common; int ref_fb_idx; - if (ref_frame_flag == VP8_LAST_FLAG) + if (ref_frame_flag == VP8_LAST_FRAME) ref_fb_idx = cm->lst_fb_idx; - else if (ref_frame_flag == VP8_GOLD_FLAG) + else if (ref_frame_flag == VP8_GOLD_FRAME) ref_fb_idx = cm->gld_fb_idx; - else if (ref_frame_flag == VP8_ALT_FLAG) + else if (ref_frame_flag == VP8_ALTR_FRAME) ref_fb_idx = cm->alt_fb_idx; else{ vpx_internal_error(&pbi->common.error, VPX_CODEC_ERROR, @@ -156,17 +156,17 @@ vpx_codec_err_t vp8dx_get_reference(VP8D_COMP *pbi, VP8_REFFRAME ref_frame_flag, } -vpx_codec_err_t vp8dx_set_reference(VP8D_COMP *pbi, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd) +vpx_codec_err_t vp8dx_set_reference(VP8D_COMP *pbi, enum vpx_ref_frame_type ref_frame_flag, YV12_BUFFER_CONFIG *sd) { VP8_COMMON *cm = &pbi->common; int *ref_fb_ptr = NULL; int free_fb; - if (ref_frame_flag == VP8_LAST_FLAG) + if (ref_frame_flag == VP8_LAST_FRAME) ref_fb_ptr = &cm->lst_fb_idx; - else if (ref_frame_flag == VP8_GOLD_FLAG) + else if (ref_frame_flag == VP8_GOLD_FRAME) ref_fb_ptr = &cm->gld_fb_idx; - else if (ref_frame_flag == VP8_ALT_FLAG) + else if (ref_frame_flag == VP8_ALTR_FRAME) ref_fb_ptr = &cm->alt_fb_idx; else{ vpx_internal_error(&pbi->common.error, VPX_CODEC_ERROR, |