Merge "Fixed hang in the case of multiple sps id." into mnc-dev am: 16b019a620 am: 5ecccccbd7 am: 5cf7f81ca3

am: 33fef92f58

Change-Id: I9a28b0fb6a71c1cccee001d9b895d84548a5ef17
This commit is contained in:
Ray Essick 2017-06-07 00:03:35 +00:00 committed by android-build-merger
commit e0f81b63d0

View file

@ -564,7 +564,10 @@ WORD32 ih264d_parse_sps(dec_struct_t *ps_dec, dec_bit_stream_t *ps_bitstrm)
/*--------------------------------------------------------------------*/
ps_seq = ps_dec->pv_scratch_sps_pps;
*ps_seq = ps_dec->ps_sps[u1_seq_parameter_set_id];
if(ps_dec->i4_header_decoded & 1)
{
*ps_seq = *ps_dec->ps_cur_sps;
}
if((ps_dec->i4_header_decoded & 1) && (ps_seq->u1_profile_idc != u1_profile_idc))