diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2016-05-13 22:36:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-13 22:36:20 +0000 |
| commit | a2199594aebb35e499a72f21350c2b79441b9dab (patch) | |
| tree | 70a1bd4fa7878cf11c4aab9617ac05db54be69b3 | |
| parent | 42432034caba83b6234a87d000f1591396a14a56 (diff) | |
| parent | 2d0ff948ac444424ba15b3fba8f29c0a3d836a3a (diff) | |
| download | android_external_libavc-a2199594aebb35e499a72f21350c2b79441b9dab.tar.gz android_external_libavc-a2199594aebb35e499a72f21350c2b79441b9dab.tar.bz2 android_external_libavc-a2199594aebb35e499a72f21350c2b79441b9dab.zip | |
Merge "Decoder: Fix for handling invalid intra mode" into mnc-dev am: 37579218eb am: af63f6f357
am: 2d0ff948ac
* commit '2d0ff948ac444424ba15b3fba8f29c0a3d836a3a':
Decoder: Fix for handling invalid intra mode
Change-Id: I558305b0c1d24157a2ac5bb1f1087ae2cac461cd
| -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]; |