commit 5ecccccbd759bce13a6b54bc2600902e18e0a5d1
author Ray Essick <essick@google.com> Tue Jun 06 23:58:05 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 06 23:58:05 2017 +0000
tree 9f10d446d90eeba0e57955ef9305f4afa86e6041
parent 4bbbcfe76d8c63fcb4dd66ffe11f1cc9c66832b9
parent 16b019a620c35d6bb94fa4302545c64052392376

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

Change-Id: Id1c0b6150c192718b69db226a373532f723843a7

decoder/ih264d_parse_headers.c

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 @@
     /*--------------------------------------------------------------------*/
 
     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))