[FFmpeg-cvslog] r22170 - trunk/libavcodec/vaapi_h264.c

[gb]

Author: gb
Date: Wed Mar  3 16:23:22 2010
New Revision: 22170

Log:
Cope with rev 22169 change:
Merge weight & offset tables.

Modified:
   trunk/libavcodec/vaapi_h264.c

Modified: trunk/libavcodec/vaapi_h264.c
==============================================================================
--- trunk/libavcodec/vaapi_h264.c	Wed Mar  3 15:41:43 2010	(r22169)
+++ trunk/libavcodec/vaapi_h264.c	Wed Mar  3 16:23:22 2010	(r22170)
@@ -198,16 +198,16 @@ static void fill_vaapi_plain_pred_weight
         /* 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];
-            luma_offset[i] = h->luma_offset[list][i];
+            luma_weight[i] = h->luma_weight[list][i][0];
+            luma_offset[i] = h->luma_weight[list][i][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];
-                chroma_offset[i][j] = h->chroma_offset[list][i][j];
+                chroma_weight[i][j] = h->chroma_weight[list][i][j][0];
+                chroma_offset[i][j] = h->chroma_weight[list][i][j][1];
             } else {
                 chroma_weight[i][j] = 1 << h->chroma_log2_weight_denom;
                 chroma_offset[i][j] = 0;