Commit 7b59eb89 authored by fenrir's avatar fenrir

Fixed DXVA2 H264 hwaccel after luma/chroma_weight changes.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@22211 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 80df1ad8
...@@ -220,11 +220,11 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice, ...@@ -220,11 +220,11 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice,
for (plane = 0; plane < 3; plane++) { for (plane = 0; plane < 3; plane++) {
int w, o; int w, o;
if (plane == 0 && h->luma_weight_flag[list]) { if (plane == 0 && h->luma_weight_flag[list]) {
w = h->luma_weight[list][i][0]; w = h->luma_weight[i][list][0];
o = h->luma_weight[list][i][1]; o = h->luma_weight[i][list][1];
} else if (plane >= 1 && h->chroma_weight_flag[list]) { } else if (plane >= 1 && h->chroma_weight_flag[list]) {
w = h->chroma_weight[list][i][plane-1][0]; w = h->chroma_weight[i][list][plane-1][0];
o = h->chroma_weight[list][i][plane-1][1]; o = h->chroma_weight[i][list][plane-1][1];
} else { } else {
w = 1 << (plane == 0 ? h->luma_log2_weight_denom : w = 1 << (plane == 0 ? h->luma_log2_weight_denom :
h->chroma_log2_weight_denom); h->chroma_log2_weight_denom);
......
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