[automerger] Bug fix for flush without valid frames am: 10c1176f1b am: 54fe392964 am: 6261ed297b am: 051d4fb2dc am: 1863b7cc03 am: e6d4971fdb am: 309f184ed5 am: 99015cf2e6

Change-Id: I1fbf4c51536d8b759988b7869e3762854d832aa0
This commit is contained in:
Android Build Merger (Role) 2018-05-21 23:36:29 +00:00
commit eb9952c5f1

View file

@ -1979,8 +1979,16 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op)
}
if(ps_dec->u1_flushfrm && ps_dec->u1_init_dec_flag)
if(ps_dec->u1_flushfrm)
{
if(ps_dec->u1_init_dec_flag == 0)
{
/*Come out of flush mode and return*/
ps_dec->u1_flushfrm = 0;
return (IV_FAIL);
}
ih264d_get_next_display_field(ps_dec, ps_dec->ps_out_buffer,
&(ps_dec->s_disp_op));