diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-01-19 00:05:21 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-01-19 00:05:21 -0500 |
| commit | 11ce364dfcc8eb85371e79290d10c9976bc19953 (patch) | |
| tree | 2c2735a4aca925d2493b6bbd3c6a03ed06a2ef6b /vp8/decoder | |
| parent | 6c0f7e3ae758ec9faae0890d2399e50b335a1d75 (diff) | |
| parent | f97f2b1bb6c08661b88324ef15354505dad4a041 (diff) | |
| download | libvpx-11ce364dfcc8eb85371e79290d10c9976bc19953.tar libvpx-11ce364dfcc8eb85371e79290d10c9976bc19953.tar.gz libvpx-11ce364dfcc8eb85371e79290d10c9976bc19953.tar.bz2 libvpx-11ce364dfcc8eb85371e79290d10c9976bc19953.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/decoder')
| -rw-r--r-- | vp8/decoder/onyxd_if.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/vp8/decoder/onyxd_if.c b/vp8/decoder/onyxd_if.c index 063b6a468..3d68db071 100644 --- a/vp8/decoder/onyxd_if.c +++ b/vp8/decoder/onyxd_if.c @@ -257,12 +257,7 @@ static void ref_cnt_fb (int *buf, int *idx, int new_idx) /* If any buffer copy / swapping is signalled it should be done here. */ static int swap_frame_buffers (VP8_COMMON *cm) { - int fb_to_update_with, err = 0; - - if (cm->refresh_last_frame) - fb_to_update_with = cm->lst_fb_idx; - else - fb_to_update_with = cm->new_fb_idx; + int err = 0; /* The alternate reference frame or golden frame can be updated * using the new, last, or golden/alt ref frame. If it @@ -274,7 +269,7 @@ static int swap_frame_buffers (VP8_COMMON *cm) int new_fb = 0; if (cm->copy_buffer_to_arf == 1) - new_fb = fb_to_update_with; + new_fb = cm->lst_fb_idx; else if (cm->copy_buffer_to_arf == 2) new_fb = cm->gld_fb_idx; else @@ -288,7 +283,7 @@ static int swap_frame_buffers (VP8_COMMON *cm) int new_fb = 0; if (cm->copy_buffer_to_gf == 1) - new_fb = fb_to_update_with; + new_fb = cm->lst_fb_idx; else if (cm->copy_buffer_to_gf == 2) new_fb = cm->alt_fb_idx; else |