leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media: vicodec: bugfix - replace '=' with '|='

Browse Source 
In the fwht_encode_frame, 'encoding = encode_plane'
should be replaced with 'encoding |= encode_plane'
so existing flags won't be overwrriten.

Signed-off-by: Dafna Hirschfeld <dafna3@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Dafna Hirschfeld 2018-12-17 12:56:17 -05:00 committed by Mauro Carvalho Chehab
parent 886ba97fb6
commit 2a850b9413
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/platform/vicodec/codec-fwht.c
View File

@ -787,10 +787,10 @@ u32 fwht_encode_frame(struct fwht_raw_frame *frm,
if (frm->components_num == 4) {
rlco_max = rlco + size / 2 - 256;
encoding = encode_plane(frm->alpha, ref_frm->alpha, &rlco,
rlco_max, cf, frm->height, frm->width,
frm->luma_alpha_step,
is_intra, next_is_intra);
encoding |= encode_plane(frm->alpha, ref_frm->alpha, &rlco,
rlco_max, cf, frm->height, frm->width,
frm->luma_alpha_step,
is_intra, next_is_intra);
if (encoding & FWHT_FRAME_UNENCODED)
encoding |= FWHT_ALPHA_UNENCODED;
encoding &= ~FWHT_FRAME_UNENCODED;