Commit 88b0304d authored by gb's avatar gb

Cope with rev 22183:

Reorder indexes in weight tables.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@22202 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 9acbdf22
...@@ -198,16 +198,16 @@ static void fill_vaapi_plain_pred_weight_table(H264Context *h, ...@@ -198,16 +198,16 @@ static void fill_vaapi_plain_pred_weight_table(H264Context *h,
/* VA API also wants the inferred (default) values, not /* VA API also wants the inferred (default) values, not
only what is available in the bitstream (7.4.3.2). */ only what is available in the bitstream (7.4.3.2). */
if (h->luma_weight_flag[list]) { if (h->luma_weight_flag[list]) {
luma_weight[i] = h->luma_weight[list][i][0]; luma_weight[i] = h->luma_weight[i][list][0];
luma_offset[i] = h->luma_weight[list][i][1]; luma_offset[i] = h->luma_weight[i][list][1];
} else { } else {
luma_weight[i] = 1 << h->luma_log2_weight_denom; luma_weight[i] = 1 << h->luma_log2_weight_denom;
luma_offset[i] = 0; luma_offset[i] = 0;
} }
for (j = 0; j < 2; j++) { for (j = 0; j < 2; j++) {
if (h->chroma_weight_flag[list]) { if (h->chroma_weight_flag[list]) {
chroma_weight[i][j] = h->chroma_weight[list][i][j][0]; chroma_weight[i][j] = h->chroma_weight[i][list][j][0];
chroma_offset[i][j] = h->chroma_weight[list][i][j][1]; chroma_offset[i][j] = h->chroma_weight[i][list][j][1];
} else { } else {
chroma_weight[i][j] = 1 << h->chroma_log2_weight_denom; chroma_weight[i][j] = 1 << h->chroma_log2_weight_denom;
chroma_offset[i][j] = 0; chroma_offset[i][j] = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment