commit dacdb263a3254c55e614faf09e6d94153aaf6f91
author android-build-team Robot <android-build-team-robot@google.com> Wed Aug 23 19:20:52 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Aug 23 19:20:52 2017 +0000
tree bf9a80782fd8bcbcd6f46538e57f64f5674af7f3
parent bb5ba08b8e401f6ead650f810faf6ff1df0daa48
parent bbb3005e3d110df9d36c57d1dfd5a9e98c18c926

Merge cherrypicks of [2780997, 2781272, 2781273, 2780106, 2780107, 2779714, 2779715, 2779716, 2779717, 2779979, 2781313, 2781314, 2781315, 2781316, 2781317, 2781318, 2779718, 2779719, 2781352, 2781353, 2779980, 2781610] into oc-r5-release

Change-Id: I2360b29809c3e810f5af625e415b274cf34e3584

decoder/impeg2d_pnb_pic.c

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 @@
 
         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);