[SCM] libav/experimental: vaapi: Update idct_permutation location after dsputil/idctdsp split

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d0449e754553b0c110b6cd75f6725b82144fbd2a
Author: Diego Biurrun <diego at biurrun.de>
Date:   Tue Jul 1 07:27:50 2014 -0700

    vaapi: Update idct_permutation location after dsputil/idctdsp split

diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c
index 03fb670..31e0218 100644
--- a/libavcodec/vaapi_mpeg2.c
+++ b/libavcodec/vaapi_mpeg2.c
@@ -90,7 +90,7 @@ static int vaapi_mpeg2_start_frame(AVCodecContext *avctx, av_unused const uint8_
     iq_matrix->load_chroma_non_intra_quantiser_matrix   = 1;
 
     for (i = 0; i < 64; i++) {
-        int n = s->dsp.idct_permutation[ff_zigzag_direct[i]];
+        int n = s->idsp.idct_permutation[ff_zigzag_direct[i]];
         iq_matrix->intra_quantiser_matrix[i]            = s->intra_matrix[n];
         iq_matrix->non_intra_quantiser_matrix[i]        = s->inter_matrix[n];
         iq_matrix->chroma_intra_quantiser_matrix[i]     = s->chroma_intra_matrix[n];
diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c
index fc3a15e..abdb6d9 100644
--- a/libavcodec/vaapi_mpeg4.c
+++ b/libavcodec/vaapi_mpeg4.c
@@ -109,7 +109,7 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_
         iq_matrix->load_non_intra_quant_mat     = 1;
 
         for (i = 0; i < 64; i++) {
-            int n = s->dsp.idct_permutation[ff_zigzag_direct[i]];
+            int n = s->idsp.idct_permutation[ff_zigzag_direct[i]];
             iq_matrix->intra_quant_mat[i]       = s->intra_matrix[n];
             iq_matrix->non_intra_quant_mat[i]   = s->inter_matrix[n];
         }

-- 
Libav/FFmpeg packaging