aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2023-05-15 13:35:42 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2023-05-15 18:48:57 +0200
commitf74196e1462c003481b5fda3698b947946032129 (patch)
treee4c75bbfc00563b7cffabbe1a05cce305b11a87b
parent74d424470c14312bb0a9c54e3e69d5cfd922bb44 (diff)
downloadffmpeg-f74196e1462c003481b5fda3698b947946032129.tar.gz
avcodec/vdpau_mpeg4: fix order of quant matrix coefficientsrelease/4.3
The matrix coefficients are stored permutated for the IDCT, rather then in plain raster order, and need to be un-permutated for the hardware.
-rw-r--r--libavcodec/vdpau_mpeg4.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/vdpau_mpeg4.c b/libavcodec/vdpau_mpeg4.c
index 93b25beb1f..59cdb96378 100644
--- a/libavcodec/vdpau_mpeg4.c
+++ b/libavcodec/vdpau_mpeg4.c
@@ -74,8 +74,9 @@ static int vdpau_mpeg4_start_frame(AVCodecContext *avctx,
info->alternate_vertical_scan_flag = s->alternate_scan;
info->top_field_first = s->top_field_first;
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];
}
ff_vdpau_common_start_frame(pic_ctx, buffer, size);