diff options
| -rw-r--r-- | libavcodec/vp9mvs.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libavcodec/vp9mvs.c b/libavcodec/vp9mvs.c index 2f37755046..1f65aaac0a 100644 --- a/libavcodec/vp9mvs.c +++ b/libavcodec/vp9mvs.c @@ -191,9 +191,13 @@ static void find_ref_mvs(VP9Context *s, if (mv->ref[0] != ref && mv->ref[0] >= 0) RETURN_SCALE_MV(mv->mv[0], s->signbias[mv->ref[0]] != s->signbias[ref]); - if (mv->ref[1] != ref && mv->ref[1] >= 0) + if (mv->ref[1] != ref && mv->ref[1] >= 0 && + // BUG - libvpx has this condition regardless of whether + // we used the first ref MV and pre-scaling + AV_RN32A(&mv->mv[0]) != AV_RN32A(&mv->mv[1])) { RETURN_SCALE_MV(mv->mv[1], s->signbias[mv->ref[1]] != s->signbias[ref]); + } } } @@ -204,9 +208,13 @@ static void find_ref_mvs(VP9Context *s, if (mv->ref[0] != ref && mv->ref[0] >= 0) RETURN_SCALE_MV(mv->mv[0], s->signbias[mv->ref[0]] != s->signbias[ref]); - if (mv->ref[1] != ref && mv->ref[1] >= 0) + if (mv->ref[1] != ref && mv->ref[1] >= 0 && + // BUG - libvpx has this condition regardless of whether + // we used the first ref MV and pre-scaling + AV_RN32A(&mv->mv[0]) != AV_RN32A(&mv->mv[1])) { RETURN_SCALE_MV(mv->mv[1], s->signbias[mv->ref[1]] != s->signbias[ref]); + } } AV_ZERO32(pmv); |