diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:14:58 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:14:58 -0800 |
| commit | 68b16a3e8f6f0e4fdc089c9aab5eaa7fb809dd0e (patch) | |
| tree | 37df200592dde3692ce4b46f327ea23def5bbe43 /decoder/ih264d_parse_bslice.c | |
| parent | cccc2b85cd9759336fd66db717f5c9f0363cc462 (diff) | |
| parent | 64112d21e356f999c7c8e4d11fbdaee29898f931 (diff) | |
| download | android_external_libavc-staging/cm-13.0+r22.tar.gz android_external_libavc-staging/cm-13.0+r22.tar.bz2 android_external_libavc-staging/cm-13.0+r22.zip | |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/external/libavc into cm-13.0staging/cm-13.0+r22
Android 6.0.1 release 22
Diffstat (limited to 'decoder/ih264d_parse_bslice.c')
| -rw-r--r-- | decoder/ih264d_parse_bslice.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/decoder/ih264d_parse_bslice.c b/decoder/ih264d_parse_bslice.c index 0758b77..85b0d0f 100644 --- a/decoder/ih264d_parse_bslice.c +++ b/decoder/ih264d_parse_bslice.c @@ -1590,7 +1590,14 @@ WORD32 ih264d_parse_bslice(dec_struct_t * ps_dec, UWORD16 u2_first_mb_in_slice) if(ps_slice->u1_nal_ref_idc != 0) { if(!ps_dec->ps_dpb_cmds->u1_dpb_commands_read) - ps_dec->u4_bitoffset = ih264d_read_mmco_commands(ps_dec); + { + i_temp = ih264d_read_mmco_commands(ps_dec); + if (i_temp < 0) + { + return ERROR_DBP_MANAGER_T; + } + ps_dec->u4_bitoffset = i_temp; + } else ps_bitstrm->u4_ofst += ps_dec->u4_bitoffset; } |