ref: 1f3c43e6026d36e2c4de523f84680ddb61525bd1
parent: 75441e1e0844647b099a41cff804b3854acd3817
parent: caad1686d481c58b30414d2097c31df92be431a1
author: Adrian Grange <agrange@google.com>
date: Tue Jul 22 11:17:27 EDT 2014
Merge "Fix get_frame_type function"
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -2362,9 +2362,9 @@
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) {--
⑨