[PATCHv2 4/7] vicodec: simplify blocktype checking

[Hans Verkuil]

From: Hans Verkuil <hans.verk...@cisco.com>

Simplify some blocktype/is_intra checks.

Signed-off-by: Hans Verkuil <hans.verk...@cisco.com>
---
 drivers/media/platform/vicodec/vicodec-codec.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/media/platform/vicodec/vicodec-codec.c 
b/drivers/media/platform/vicodec/vicodec-codec.c
index 7bd11a974db0..e402d988f2ad 100644
--- a/drivers/media/platform/vicodec/vicodec-codec.c
+++ b/drivers/media/platform/vicodec/vicodec-codec.c
@@ -663,11 +663,10 @@ static u32 encode_plane(u8 *input, u8 *refp, __be16 
**rlco, __be16 *rlco_max,
                        if (!is_intra)
                                blocktype = decide_blocktype(input, refp,
                                        deltablock, width, input_step);
-                       if (is_intra || blocktype == IBLOCK) {
+                       if (blocktype == IBLOCK) {
                                fwht(input, cf->coeffs, width, input_step, 1);
                                quantize_intra(cf->coeffs, cf->de_coeffs,
                                               cf->i_frame_qp);
-                               blocktype = IBLOCK;
                        } else {
                                /* inter code */
                                encoding |= FRAME_PCODED;
-- 
2.18.0