diff options
| author | Ray Essick <essick@google.com> | 2017-06-07 00:15:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-07 00:15:36 +0000 |
| commit | 1ff5470f0490075f926028c3f2ef8f0a437609b5 (patch) | |
| tree | 2a6ff35b68b77286a32b3b789801a3d5c9be2407 | |
| parent | bdb0d58917a935b32fe52e6022e774d188ce795a (diff) | |
| parent | 48e9e72610f27ca7d143eea35fb36f22bc9ed7da (diff) | |
| download | libavc-1ff5470f0490075f926028c3f2ef8f0a437609b5.tar.gz | |
Merge "Fixed hang in the case of multiple sps id." into mnc-dev am: 16b019a620 am: 5ecccccbd7 am: 5cf7f81ca3 am: 33fef92f58 am: e0f81b63d0 am: a8c9c1172c am: 38b8663e90
am: 48e9e72610
Change-Id: Ie3bf177ddcb4da281c6bef00d0c1e6ad8154de14
| -rw-r--r-- | decoder/ih264d_parse_headers.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/decoder/ih264d_parse_headers.c b/decoder/ih264d_parse_headers.c index 352d605..d8c37a6 100644 --- a/decoder/ih264d_parse_headers.c +++ b/decoder/ih264d_parse_headers.c @@ -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)) |