changeset 11359:471c370c6b05 libavcodec

Cope with rev 22183: Reorder indexes in weight tables.
author gb
date Thu, 04 Mar 2010 09:14:19 +0000
parents a1376a6f9af1
children dedeca07ba3b
files vaapi_h264.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/vaapi_h264.c	Thu Mar 04 04:58:43 2010 +0000
+++ b/vaapi_h264.c	Thu Mar 04 09:14:19 2010 +0000
@@ -198,16 +198,16 @@
         /* VA API also wants the inferred (default) values, not
            only what is available in the bitstream (7.4.3.2). */
         if (h->luma_weight_flag[list]) {
-            luma_weight[i] = h->luma_weight[list][i][0];
-            luma_offset[i] = h->luma_weight[list][i][1];
+            luma_weight[i] = h->luma_weight[i][list][0];
+            luma_offset[i] = h->luma_weight[i][list][1];
         } else {
             luma_weight[i] = 1 << h->luma_log2_weight_denom;
             luma_offset[i] = 0;
         }
         for (j = 0; j < 2; j++) {
             if (h->chroma_weight_flag[list]) {
-                chroma_weight[i][j] = h->chroma_weight[list][i][j][0];
-                chroma_offset[i][j] = h->chroma_weight[list][i][j][1];
+                chroma_weight[i][j] = h->chroma_weight[i][list][j][0];
+                chroma_offset[i][j] = h->chroma_weight[i][list][j][1];
             } else {
                 chroma_weight[i][j] = 1 << h->chroma_log2_weight_denom;
                 chroma_offset[i][j] = 0;