summaryrefslogtreecommitdiff
path: root/libavcodec/vaapi_h264.c
diff options
context:
space:
mode:
authorGwenole Beauchesne <gbeauchesne@splitted-desktop.com>2010-03-04 09:14:19 +0000
committerGwenole Beauchesne <gbeauchesne@splitted-desktop.com>2010-03-04 09:14:19 +0000
commit11ae0c52b93652328d356d9316789b830e785175 (patch)
tree4259a1d832ba58416a2149a22603ea75069f8e49 /libavcodec/vaapi_h264.c
parent871b641b8042d072fa9fe1f9b7086c5504c23ac2 (diff)
Cope with rev 22183:
Reorder indexes in weight tables. Originally committed as revision 22202 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/vaapi_h264.c')
-rw-r--r--libavcodec/vaapi_h264.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
index 277d2ecb0d..f49a54d1e2 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][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;