Commit 32b6d31e authored by Ronald S. Bultje's avatar Ronald S. Bultje

vp9: don't allow compound references if error_resilience is enabled.

libvpx (probably accidentally) clears the bits if error_res is set,
along with keyframe/intraonly. This probably wasn't the intention
(since it's local data), but it's behaviour we have to copy...
parent 5de142d3
...@@ -648,8 +648,9 @@ static int decode_frame_header(AVCodecContext *ctx, ...@@ -648,8 +648,9 @@ static int decode_frame_header(AVCodecContext *ctx,
s->highprecisionmvs = get_bits1(&s->gb); s->highprecisionmvs = get_bits1(&s->gb);
s->filtermode = get_bits1(&s->gb) ? FILTER_SWITCHABLE : s->filtermode = get_bits1(&s->gb) ? FILTER_SWITCHABLE :
get_bits(&s->gb, 2); get_bits(&s->gb, 2);
s->allowcompinter = s->signbias[0] != s->signbias[1] || s->allowcompinter = !s->errorres &&
s->signbias[0] != s->signbias[2]; (s->signbias[0] != s->signbias[1] ||
s->signbias[0] != s->signbias[2]);
if (s->allowcompinter) { if (s->allowcompinter) {
if (s->signbias[0] == s->signbias[1]) { if (s->signbias[0] == s->signbias[1]) {
s->fixcompref = 2; s->fixcompref = 2;
......
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