Merge \\"Decoder: Initialize first_pb_nal_in_pic for error slices\\" into mnc-dev am: b9d7cba8bf

am: c73e000665

Change-Id: I94996ac8de713bf46ea1b2ce408ab89c173411e4
This commit is contained in:
Robert Shih 2016-06-21 18:56:14 +00:00 committed by android-build-merger
commit 59248aa67c
2 changed files with 1 additions and 1 deletions

View file

@ -1895,6 +1895,7 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op)
ps_dec->cur_dec_mb_num = 0;
ps_dec->cur_recon_mb_num = 0;
ps_dec->u4_first_slice_in_pic = 2;
ps_dec->u1_first_pb_nal_in_pic = 1;
ps_dec->u1_slice_header_done = 0;
ps_dec->u1_dangling_field = 0;

View file

@ -940,7 +940,6 @@ WORD32 ih264d_end_of_pic(dec_struct_t *ps_dec,
dec_slice_params_t *ps_cur_slice = ps_dec->ps_cur_slice;
WORD32 ret;
ps_dec->u1_first_pb_nal_in_pic = 1;
ps_dec->u2_mbx = 0xffff;
ps_dec->u2_mby = 0;
{