diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-10 20:31:55 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-10 20:31:55 +0000 |
| commit | 69214eeac523e3c84baaa421f89b1b85ddd88750 (patch) | |
| tree | d2f481cc11196bb83009e81fe5cd9a513e066dfb | |
| parent | cf501925814757e7ea1a352dff36a6f4d36e5346 (diff) | |
| parent | 9079f4a5807fe8330f3f63af05846dac3f01bb04 (diff) | |
| download | platform_external_libmpeg2-oreo-m6-s4-release.tar.gz platform_external_libmpeg2-oreo-m6-s4-release.tar.bz2 platform_external_libmpeg2-oreo-m6-s4-release.zip | |
Merge cherrypicks of [4741663, 4741664, 4741665, 4741666, 4743080, 4743081, 4743082, 4743083, 4741262, 4741263, 4741264, 4741265, 4741266, 4741667, 4743084, 4741242, 4741243, 4741741, 4741742, 4741743, 4741744, 4741822, 4743085, 4741668, 4741338, 4743055, 4743056, 4743070, 4743073, 4743075, 4743076, 4743078, 4743079, 4743161, 4743162, 4743164, 4743165, 4743167, 4743168, 4743169, 4743170, 4741681, 4741682, 4741683, 4741684, 4741685, 4741686, 4741687, 4741688, 4741689, 4741690, 4741691, 4741692, 4741693, 4741694, 4741695, 4741696, 4741697, 4741698, 4741699, 4743240, 4743241, 4743242, 4743243, 4741745, 4741823, 4741824, 4741825, 4741267, 4741268, 4743244, 4743280, 4743281, 4743224, 4743203, 4743204, 4743205, 4741746, 4741747, 4743245, 4741826, 4741827, 4741828, 4741829, 4741748, 4741749, 4741750, 4743233, 4743282, 4741244, 4741245, 4741246, 4741247, 4743206, 4743207, 4743208, 4743209, 4743210, 4743211, 4743212, 4743213, 4743214, 4743215, 4743216, 4743217, 4743218, 4743219, 4743360, 4743361, 4743362, 4743363, 4743364, 4743365, 4743366, 4743367, 4743368, 4743369, 4743370, 4743371, 4743372, 4743373, 4743374, 4743375, 4743376, 4743377, 4743283, 4743284, 4741830, 4742501, 4743246, 4743086, 4743087, 4743378, 4743379, 4741751] into sparse-4749909-L04200000199131547android-8.1.0_r46oreo-m6-s4-release
Change-Id: I22e3783f86aed38c82645bdedb8a77f24dc1a96f
| -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) { /****************************************************************/ |