diff options
| author | Adrian Grange <agrange@google.com> | 2014-07-22 15:17:27 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-07-22 15:17:27 -0700 |
| commit | 1f3c43e6026d36e2c4de523f84680ddb61525bd1 (patch) | |
| tree | 5ce83affe4264d803d065608eb80506b500e9a96 /vp9/encoder | |
| parent | 75441e1e0844647b099a41cff804b3854acd3817 (diff) | |
| parent | caad1686d481c58b30414d2097c31df92be431a1 (diff) | |
| download | libvpx-1f3c43e6026d36e2c4de523f84680ddb61525bd1.tar libvpx-1f3c43e6026d36e2c4de523f84680ddb61525bd1.tar.gz libvpx-1f3c43e6026d36e2c4de523f84680ddb61525bd1.tar.bz2 libvpx-1f3c43e6026d36e2c4de523f84680ddb61525bd1.zip | |
Merge "Fix get_frame_type function"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index afe78efc8..f80c0bc3e 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -2362,9 +2362,9 @@ static MV_REFERENCE_FRAME get_frame_type(const VP9_COMP *cpi) { else if (cpi->rc.is_src_frame_alt_ref && cpi->refresh_golden_frame) return ALTREF_FRAME; else if (cpi->refresh_golden_frame || cpi->refresh_alt_ref_frame) - return LAST_FRAME; - else return GOLDEN_FRAME; + else + return LAST_FRAME; } static TX_MODE select_tx_mode(const VP9_COMP *cpi) { |