diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-11-08 15:12:45 -0800 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-11-09 11:58:32 -0800 |
| commit | eb80228dd62f79919836bfbefa30b8c6004c61c3 (patch) | |
| tree | 80f766431c885b3a5f17ba7e5f4b5771d200ca40 /decoder/ih264d_api.c | |
| parent | 130f76a5868449479de535f6485ddc571820515a (diff) | |
| parent | d9bcf017e554b84306da4002b0ac97c45afd9f63 (diff) | |
| download | android_external_libavc-eb80228dd62f79919836bfbefa30b8c6004c61c3.tar.gz android_external_libavc-eb80228dd62f79919836bfbefa30b8c6004c61c3.tar.bz2 android_external_libavc-eb80228dd62f79919836bfbefa30b8c6004c61c3.zip | |
Merge tag 'android-6.0.1_r74' into HEAD
CYNGNOS-3303
Android 6.0.1 release 74
Change-Id: I85e892e50468a5cf4430ba6618f097fd26992080
Diffstat (limited to 'decoder/ih264d_api.c')
| -rw-r--r-- | decoder/ih264d_api.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c index 6aa71f2..cbfc8ca 100644 --- a/decoder/ih264d_api.c +++ b/decoder/ih264d_api.c @@ -2146,9 +2146,10 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op) 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); - if((ret1 == ERROR_UNAVAIL_PICBUF_T) || (ret1 == ERROR_UNAVAIL_MVBUF_T)) + if((ret1 == ERROR_UNAVAIL_PICBUF_T) || (ret1 == ERROR_UNAVAIL_MVBUF_T) || + (ret1 == ERROR_INV_SPS_PPS_T)) { - return IV_FAIL; + ret = ret1; } } |