Merge "Decoder: Fixed hang in the case of dangling field" into mnc-dev

This commit is contained in:
TreeHugger Robot 2017-10-03 17:29:09 +00:00 committed by Android (Google) Code Review
commit 2f1ca945b1

View file

@ -1396,9 +1396,8 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice,
if(ps_dec->u1_dangling_field == 1)
{
ps_dec->u1_second_field = 1 - ps_dec->u1_second_field;
ps_cur_slice->u1_bottom_field_flag = u1_bottom_field_flag;
ps_dec->u2_prv_frame_num = u2_frame_num;
ps_dec->u1_first_slice_in_stream = 0;
ps_dec->u1_top_bottom_decoded = TOP_FIELD_ONLY | BOT_FIELD_ONLY;
return ERROR_DANGLING_FIELD_IN_PIC;
}