ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/vaapi_h264.c

 /*
  * H.264 HW decode acceleration through VA API
  *
  * Copyright (C) 2008-2009 Splitted-Desktop Systems
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ skipping 180 matching lines @@
 {
     unsigned int i, j;
 
     *luma_weight_flag    = h->luma_weight_flag[list];
     *chroma_weight_flag  = h->chroma_weight_flag[list];
 
     for (i = 0; i < h->ref_count[list]; i++) {
         /* 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[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];
-                chroma_offset[i][j] = h->chroma_offset[list][i][j];
+                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;
             }
         }
     }
 }
 
 /** Initializes and starts decoding a frame with VA API. */
 static int start_frame(AVCodecContext          *avctx,
@@ skipping 117 matching lines @@
     .name           = "h264_vaapi",
     .type           = CODEC_TYPE_VIDEO,
     .id             = CODEC_ID_H264,
     .pix_fmt        = PIX_FMT_VAAPI_VLD,
     .capabilities   = 0,
     .start_frame    = start_frame,
     .end_frame      = end_frame,
     .decode_slice   = decode_slice,
     .priv_data_size = 0,
 };