[SCM] libav/experimental: Cope with rev 22169 change: Merge weight & offset tables.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 48bf1325acebf118d43216aaadc55808e4d1ed71
Author: Gwenole Beauchesne <gbeauchesne at splitted-desktop.com>
Date:   Wed Mar 3 15:23:22 2010 +0000

    Cope with rev 22169 change:
    Merge weight & offset tables.
    
    Originally committed as revision 22170 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
index 3910bad..277d2ec 100644
--- a/libavcodec/vaapi_h264.c
+++ b/libavcodec/vaapi_h264.c
@@ -198,16 +198,16 @@ static void fill_vaapi_plain_pred_weight_table(H264Context   *h,
         /* 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;

-- 
Libav/FFmpeg packaging