diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-13 20:33:03 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-13 20:33:03 +0000 |
| commit | 7a3a25501e3cb3641be88fa004dc8f8152e5072a (patch) | |
| tree | 9c7f465e58a693b2e3705f1f3d87936f03907686 | |
| parent | 584c20979547393e4731baa229eb6ed2839ebba4 (diff) | |
| parent | 7e2e5d04453d79ddba3bd1ef373734e90b993a1c (diff) | |
| download | platform_external_libmpeg2-nougat-mr1.1-release.tar.gz platform_external_libmpeg2-nougat-mr1.1-release.tar.bz2 platform_external_libmpeg2-nougat-mr1.1-release.zip | |
Merge cherrypicks of [2891229, 2891249, 2891250, 2890684, 2890685, 2891070, 2891071, 2891269, 2891072, 2891073, 2891074, 2891075, 2891077, 2891079, 2891081, 2890238, 2890239, 2891231, 2891088, 2891349, 2891350, 2890242] into nyc-mr1-security-a-releaseandroid-7.1.1_r54nougat-mr1.1-release
Change-Id: I1f02e1d3c57aaf168d301b7476826d9fda6f845e
| -rw-r--r-- | decoder/impeg2d_pnb_pic.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/decoder/impeg2d_pnb_pic.c b/decoder/impeg2d_pnb_pic.c index 5540044..69277e5 100644 --- a/decoder/impeg2d_pnb_pic.c +++ b/decoder/impeg2d_pnb_pic.c @@ -510,6 +510,12 @@ IMPEG2D_ERROR_CODES_T impeg2d_dec_p_b_slice(dec_state_t *ps_dec) if(ret) return IMPEG2D_MB_TEX_DECODE_ERR; + + if(0 >= ps_dec->u2_num_mbs_left) + { + break; + } + IMPEG2D_TRACE_MB_START(ps_dec->u2_mb_x, ps_dec->u2_mb_y); u4_x_dst_offset = u4_frm_offset + (ps_dec->u2_mb_x << 4); |