diff options
| author | Marco Nelissen <marcone@google.com> | 2016-05-13 22:20:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-05-13 22:20:17 +0000 |
| commit | 37579218eb5261d59c36fcc741b11155894dddd7 (patch) | |
| tree | 94e3bbfd822e2fe1d271e6c43b67b0596252a578 | |
| parent | 43a1cf620f7c26f04d2c17772e25c94ac826577f (diff) | |
| parent | f38d14c5d9b3bd909dc2eecf7a0ac07dee4d75fe (diff) | |
| download | android_external_libavc-37579218eb5261d59c36fcc741b11155894dddd7.tar.gz android_external_libavc-37579218eb5261d59c36fcc741b11155894dddd7.tar.bz2 android_external_libavc-37579218eb5261d59c36fcc741b11155894dddd7.zip | |
Merge "Decoder: Fix for handling invalid intra mode" into mnc-dev
| -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]; |