Fix dxva2 decoding for some H264 samples.
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Wed, 21 Sep 2011 21:47:34 +0000 (23:47 +0200)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Wed, 21 Sep 2011 21:47:34 +0000 (23:47 +0200)
libavcodec/dxva2_h264.c

index bc80e98..3f728e2 100644 (file)
@@ -158,9 +158,10 @@ static void fill_scaling_lists(const H264Context *h, DXVA_Qmatrix_H264 *qm)
         for (j = 0; j < 16; j++)
             qm->bScalingLists4x4[i][j] = h->pps.scaling_matrix4[i][zigzag_scan[j]];
 
-    for (i = 0; i < 2; i++)
-        for (j = 0; j < 64; j++)
-            qm->bScalingLists8x8[i][j] = h->pps.scaling_matrix8[i][ff_zigzag_direct[j]];
+    for (j = 0; j < 64; j++) {
+        qm->bScalingLists8x8[0][j] = h->pps.scaling_matrix8[0][ff_zigzag_direct[j]];
+        qm->bScalingLists8x8[1][j] = h->pps.scaling_matrix8[3][ff_zigzag_direct[j]];
+    }
 }
 
 static int is_slice_short(struct dxva_context *ctx)