Merge "Decoder: Fix for handling invalid intra mode" into mnc-dev am: 37579218eb am: af63f6f357 am: 2d0ff948ac

am: a2199594ae

* commit 'a2199594ae':
  Decoder: Fix for handling invalid intra mode

Change-Id: I8ce213525d0d821cf0c0b4b2e01c04c6a01505d3
This commit is contained in:
Marco Nelissen 2016-05-13 22:39:07 +00:00 committed by android-build-merger
commit c6f7be0ea0

View file

@ -1242,6 +1242,7 @@ WORD32 ih264d_process_intra_mb(dec_struct_t * ps_dec,
+ (pu1_rem_intra4x4_pred_mode[u1_cur_sub_block]
>= i1_intra_pred);
}
i1_intra_pred = CLIP3(0, 8, i1_intra_pred);
{
UWORD8 u1_err_code = pu1_intra_err_codes[i1_intra_pred];
@ -1650,6 +1651,7 @@ WORD32 ih264d_process_intra_mb(dec_struct_t * ps_dec,
+ (pu1_rem_intra4x4_pred_mode[u1_sub_mb_num]
>= i1_intra_pred);
}
i1_intra_pred = CLIP3(0, 8, i1_intra_pred);
{
UWORD8 u1_err_code = pu1_intra_err_codes[i1_intra_pred];