diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-09-07 12:40:22 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-09-07 12:40:22 -0700 |
| commit | f94f384efaccbeb55e87ec442a8ee38a2e3e9170 (patch) | |
| tree | af28343cb22e852800fa24376f3abcb3d0bd7aba | |
| parent | 6718ae7e5dfd747712e8b76a1607b5bbbdad98d3 (diff) | |
| parent | 7109ce3f8f90a28ca9f0ee6e14f6ac5e414c62cf (diff) | |
| download | android_external_libavc-f94f384efaccbeb55e87ec442a8ee38a2e3e9170.tar.gz android_external_libavc-f94f384efaccbeb55e87ec442a8ee38a2e3e9170.tar.bz2 android_external_libavc-f94f384efaccbeb55e87ec442a8ee38a2e3e9170.zip | |
Merge tag 'android-6.0.1_r66' into HEAD
Android 6.0.1 release 66
# gpg: Signature made Tue 06 Sep 2016 09:26:24 AM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found
| -rw-r--r-- | decoder/ih264d_api.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c index 801960b..6aa71f2 100644 --- a/decoder/ih264d_api.c +++ b/decoder/ih264d_api.c @@ -2140,6 +2140,9 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op) else prev_slice_err = 2; + if(ps_dec->u4_first_slice_in_pic && (ps_dec->u2_total_mbs_coded == 0)) + prev_slice_err = 1; + ret1 = ih264d_mark_err_slice_skip(ps_dec, num_mb_skipped, ps_dec->u1_nal_unit_type == IDR_SLICE_NAL, ps_dec->ps_cur_slice->u2_frame_num, &temp_poc, prev_slice_err); |