[FFmpeg-cvslog] avcodec/cbs_av1: fix reading reference order hint in skip_mode_params()

[James Almer]

ffmpeg | branch: release/4.2 | James Almer <jamrial at gmail.com> | Fri Nov 15 15:12:14 2019 -0300| [8da31e9eef6dac51f83ea916531917ee26802b12] | committer: James Almer

avcodec/cbs_av1: fix reading reference order hint in skip_mode_params()

Reviewed-by: Ronald S. Bultje <rsbultje at gmail.com>
Signed-off-by: James Almer <jamrial at gmail.com>
(cherry picked from commit 2703068110dce2c145a2d3a0f380f8e0de79b632)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8da31e9eef6dac51f83ea916531917ee26802b12
---

 libavcodec/cbs_av1_syntax_template.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c
index 806b302de6..c843cfa02b 100644
--- a/libavcodec/cbs_av1_syntax_template.c
+++ b/libavcodec/cbs_av1_syntax_template.c
@@ -882,7 +882,7 @@ static int FUNC(skip_mode_params)(CodedBitstreamContext *ctx, RWContext *rw,
         forward_idx  = -1;
         backward_idx = -1;
         for (i = 0; i < AV1_REFS_PER_FRAME; i++) {
-            ref_hint = priv->ref[i].order_hint;
+            ref_hint = priv->ref[current->ref_frame_idx[i]].order_hint;
             dist = cbs_av1_get_relative_dist(seq, ref_hint,
                                              current->order_hint);
             if (dist < 0) {
@@ -913,7 +913,7 @@ static int FUNC(skip_mode_params)(CodedBitstreamContext *ctx, RWContext *rw,
 
             second_forward_idx = -1;
             for (i = 0; i < AV1_REFS_PER_FRAME; i++) {
-                ref_hint = priv->ref[i].order_hint;
+                ref_hint = priv->ref[current->ref_frame_idx[i]].order_hint;
                 if (cbs_av1_get_relative_dist(seq, ref_hint,
                                               forward_hint) < 0) {
                     if (second_forward_idx < 0 ||