diff options
| author |   Dafna Hirschfeld <dafna3@gmail.com> | 2018-12-17 12:56:17 -0500 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-01-16 11:22:10 -0500 |
| commit | 2a850b94135db67d87f4ab6ab2a325a42ecbe00a (patch) | |
| tree | 1c70f10b80c9c47a6e683df176b34c99b21e2efa /drivers/media/platform | |
| parent | media: MAINTAINERS: Change s5p-jpeg maintainer information. (diff) | |
| download | linux-dev-2a850b94135db67d87f4ab6ab2a325a42ecbe00a.tar.xz linux-dev-2a850b94135db67d87f4ab6ab2a325a42ecbe00a.zip | |
media: vicodec: bugfix - replace '=' with '|='
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>
Diffstat (limited to 'drivers/media/platform')
| -rw-r--r-- | drivers/media/platform/vicodec/codec-fwht.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/vicodec/codec-fwht.c b/drivers/media/platform/vicodec/codec-fwht.c index 5630f1dc45e6..a6fd0477633b 100644 --- a/drivers/media/platform/vicodec/codec-fwht.c +++ b/drivers/media/platform/vicodec/codec-fwht.c @@ -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; |