summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vp10/decoder/decodeframe.c2
-rw-r--r--vp10/encoder/encodeframe.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/vp10/decoder/decodeframe.c b/vp10/decoder/decodeframe.c
index fa28e7cf7..5c95e16bc 100644
--- a/vp10/decoder/decodeframe.c
+++ b/vp10/decoder/decodeframe.c
@@ -47,6 +47,8 @@
static int is_compound_reference_allowed(const VP10_COMMON *cm) {
int i;
+ if (frame_is_intra_only(cm))
+ return 0;
for (i = 1; i < REFS_PER_FRAME; ++i)
if (cm->ref_frame_sign_bias[i + 1] != cm->ref_frame_sign_bias[1])
return 1;
diff --git a/vp10/encoder/encodeframe.c b/vp10/encoder/encodeframe.c
index e038fe675..f303b01fc 100644
--- a/vp10/encoder/encodeframe.c
+++ b/vp10/encoder/encodeframe.c
@@ -2807,6 +2807,8 @@ void vp10_encode_frame(VP10_COMP *cpi) {
cm->comp_var_ref[0] = LAST_FRAME;
cm->comp_var_ref[1] = GOLDEN_FRAME;
}
+ } else {
+ cpi->allow_comp_inter_inter = 0;
}
if (cpi->sf.frame_parameter_update) {