diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-13 22:29:32 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-13 22:29:32 +0000 |
| commit | d9e27ecaf5345abc64ba9a059119bf89d0eb22a5 (patch) | |
| tree | 9c7f465e58a693b2e3705f1f3d87936f03907686 | |
| parent | 1861692f14016f26aeb052c93f16482b49deaebb (diff) | |
| parent | 40ec34b0d91a6a756c293467041b5c3ad3d71b74 (diff) | |
| download | platform_external_libmpeg2-nougat-mr1-volantis-release.tar.gz platform_external_libmpeg2-nougat-mr1-volantis-release.tar.bz2 platform_external_libmpeg2-nougat-mr1-volantis-release.zip | |
Merge cherrypicks of [2892168, 2892830, 2892833, 2892799, 2892800, 2892658, 2892659, 2892512, 2892869, 2892870, 2892871, 2892872, 2892873, 2892874, 2892875, 2892513, 2892514, 2892876, 2892816, 2892817, 2892923, 2892422] into nyc-mr1-volantis-releaseandroid-7.1.1_r58nougat-mr1-volantis-release
Change-Id: I24107566cc3bfd0d47434eb8ac929ab506cd0f30
| -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); |