diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2016-05-13 22:31:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-13 22:31:11 +0000 |
| commit | af63f6f35715e8426d4cffd059fbb6af42c0702a (patch) | |
| tree | 70a1bd4fa7878cf11c4aab9617ac05db54be69b3 | |
| parent | 68cdfcb381ed1e53dbe3d2d0f43d2d01fea2fff6 (diff) | |
| parent | 37579218eb5261d59c36fcc741b11155894dddd7 (diff) | |
| download | android_external_libavc-af63f6f35715e8426d4cffd059fbb6af42c0702a.tar.gz android_external_libavc-af63f6f35715e8426d4cffd059fbb6af42c0702a.tar.bz2 android_external_libavc-af63f6f35715e8426d4cffd059fbb6af42c0702a.zip | |
Merge "Decoder: Fix for handling invalid intra mode" into mnc-dev
am: 37579218eb
* commit '37579218eb5261d59c36fcc741b11155894dddd7':
Decoder: Fix for handling invalid intra mode
Change-Id: Ia41f2b0c19b83d3508044487469176894ba898d4
| -rw-r--r-- | decoder/ih264d_process_intra_mb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/decoder/ih264d_process_intra_mb.c b/decoder/ih264d_process_intra_mb.c index dde2a7e..279ff87 100644 --- a/decoder/ih264d_process_intra_mb.c +++ b/decoder/ih264d_process_intra_mb.c @@ -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]; |