Commit 9363425d authored by Paul Wilkins's avatar Paul Wilkins Committed by Gerrit Code Review
Browse files

Merge "Initialization bug for multi arf."

parents 41a17f44 7cd6330e
...@@ -1446,6 +1446,7 @@ VP9_COMP *vp9_create_compressor(VP9EncoderConfig *oxcf) { ...@@ -1446,6 +1446,7 @@ VP9_COMP *vp9_create_compressor(VP9EncoderConfig *oxcf) {
#endif #endif
cpi->refresh_alt_ref_frame = 0; cpi->refresh_alt_ref_frame = 0;
cpi->multi_arf_last_grp_enabled = 0;
cpi->b_calculate_psnr = CONFIG_INTERNAL_STATS; cpi->b_calculate_psnr = CONFIG_INTERNAL_STATS;
#if CONFIG_INTERNAL_STATS #if CONFIG_INTERNAL_STATS
...@@ -3431,7 +3432,6 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags, ...@@ -3431,7 +3432,6 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
cpi->multi_arf_allowed = 1; cpi->multi_arf_allowed = 1;
else else
cpi->multi_arf_allowed = 0; cpi->multi_arf_allowed = 0;
cpi->multi_arf_last_grp_enabled = 0;
// Normal defaults // Normal defaults
cm->reset_frame_context = 0; cm->reset_frame_context = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment