virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Cope with rev 22169 change:

Browse Source 
Merge weight & offset tables.

Originally committed as revision 22170 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Gwenole Beauchesne 2010-03-03 15:23:22 +00:00
parent 70118abd68
commit 48bf1325ac
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/vaapi_h264.c
View File

@ -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]; luma_weight[i] = h->luma_weight[list][i][0];
luma_offset[i] = h->luma_offset[list][i]; luma_offset[i] = h->luma_weight[list][i][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]; chroma_weight[i][j] = h->chroma_weight[list][i][j][0];
chroma_offset[i][j] = h->chroma_offset[list][i][j]; chroma_offset[i][j] = h->chroma_weight[list][i][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;