Commit 11ae0c52 authored by Gwenole Beauchesne's avatar Gwenole Beauchesne
Browse files

Cope with rev 22183:

Reorder indexes in weight tables.

Originally committed as revision 22202 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 871b641b
......@@ -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;
......
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