diff options
| author | Ray Essick <essick@google.com> | 2017-06-07 00:02:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-07 00:02:05 +0000 |
| commit | 33fef92f5887b4e914027e9cc9f9c7ef8a4cc30d (patch) | |
| tree | 9f10d446d90eeba0e57955ef9305f4afa86e6041 | |
| parent | e3e6c70c19693b7b209d282289afe7642d4d617a (diff) | |
| parent | 5cf7f81ca3ed95d31d46dd31821f6a7c07d86650 (diff) | |
| download | libavc-33fef92f5887b4e914027e9cc9f9c7ef8a4cc30d.tar.gz | |
Merge "Fixed hang in the case of multiple sps id." into mnc-dev am: 16b019a620 am: 5ecccccbd7
am: 5cf7f81ca3
Change-Id: Ib9ca9bbe2013d682717d5c0758e95f183332dd33
| -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)) |