diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-11 22:25:21 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-11 22:25:21 +0000 |
| commit | 15cff42da299a2c650dd4e4e8286f4e2a5f58e29 (patch) | |
| tree | d2f481cc11196bb83009e81fe5cd9a513e066dfb | |
| parent | 408f8fb66ac1fc659403dab653bba63ffb12ecc0 (diff) | |
| parent | 1f68fbd04e93a88e7d36c0bd1e4adf3f604d652d (diff) | |
| download | libmpeg2-oreo-m2-s5-release.tar.gz | |
Merge cherrypicks of [4314166, 4314167, 4314168, 4314169, 4314462, 4314463, 4314464, 4314465, 4314466, 4314643, 4314644, 4314185, 4314467, 4314468, 4315341, 4315342, 4315343, 4315344, 4315345, 4314469, 4314283, 4314186, 4314187, 4314188, 4314189, 4314190, 4314191, 4314192, 4315082, 4315083, 4315084, 4315085, 4315086, 4315087, 4315088, 4315089, 4315090, 4315091, 4315092, 4314170, 4314284, 4314285, 4314286, 4314287, 4314171, 4314172, 4315346, 4314288, 4315381, 4315401, 4315402, 4314289, 4314290, 4314291, 4314292, 4314293, 4314294, 4314295, 4314296, 4314297, 4314298, 4314299, 4314300, 4315421, 4315422, 4314034, 4314229, 4315347, 4315423, 4315424, 4315314, 4315348, 4315349, 4314470, 4315425, 4315426, 4315427, 4315428, 4315429] into sparse-4732990-L02900000181396755android-8.1.0_r36oreo-m2-s5-release
Change-Id: I3d5cbc684660a980a7f197cc2c4ffa8b62a0742a
| -rw-r--r-- | decoder/impeg2d_pnb_pic.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/decoder/impeg2d_pnb_pic.c b/decoder/impeg2d_pnb_pic.c index a3ae436..f7937a8 100644 --- a/decoder/impeg2d_pnb_pic.c +++ b/decoder/impeg2d_pnb_pic.c @@ -299,6 +299,11 @@ WORD32 impeg2d_dec_pnb_mb_params(dec_state_t *ps_dec) { u2_mb_addr_incr = impeg2d_get_mb_addr_incr(ps_stream); + if(0 == u2_mb_addr_incr) + { + return IV_FAIL; + } + if(ps_dec->u2_first_mb) { /****************************************************************/ |