[FFmpeg-cvslog] avcodec/vdpau_mpeg12: fix order of quant matrix coefficients

[Hendrik Leppkes]

ffmpeg | branch: release/4.0 | Hendrik Leppkes <h.leppkes at gmail.com> | Mon May 15 13:35:13 2023 +0200| [4c9b34fce8e75562a170fda765d6c7df16c416a2] | committer: Hendrik Leppkes

avcodec/vdpau_mpeg12: fix order of quant matrix coefficients

The matrix coefficients are stored permutated for the IDCT,
rather then in plain raster order, and need to be un-permutated
for the hardware.

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

 libavcodec/vdpau_mpeg12.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavcodec/vdpau_mpeg12.c b/libavcodec/vdpau_mpeg12.c
index d286e7e57d..41b3fd8641 100644
--- a/libavcodec/vdpau_mpeg12.c
+++ b/libavcodec/vdpau_mpeg12.c
@@ -73,8 +73,9 @@ static int vdpau_mpeg_start_frame(AVCodecContext *avctx,
     info->f_code[1][0]               = s->mpeg_f_code[1][0];
     info->f_code[1][1]               = s->mpeg_f_code[1][1];
     for (i = 0; i < 64; ++i) {
-        info->intra_quantizer_matrix[i]     = s->intra_matrix[i];
-        info->non_intra_quantizer_matrix[i] = s->inter_matrix[i];
+        int n = s->idsp.idct_permutation[i];
+        info->intra_quantizer_matrix[i]     = s->intra_matrix[n];
+        info->non_intra_quantizer_matrix[i] = s->inter_matrix[n];
     }
 
     return ff_vdpau_common_start_frame(pic_ctx, buffer, size);