Mercurial > libavcodec.hg

changeset 11340:f5ebc14d90f0 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cope with rev 22169 change: Merge weight & offset tables.
author gb
date Wed, 03 Mar 2010 15:23:22 +0000
parents a82cdda1f507
children a26f51d0bb63
files vaapi_h264.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/vaapi_h264.c	Wed Mar 03 14:41:43 2010 +0000
+++ b/vaapi_h264.c	Wed Mar 03 15:23:22 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];
-            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;