summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarish Mahendrakar <harish.mahendrakar@ittiam.com>2016-06-13 11:58:50 +0530
committerRobert Shih <robertshih@google.com>2016-06-16 17:28:19 -0700
commit7a54468cf8b56745d371baf83694c87a563907fc (patch)
tree97af62e460b34ce2d4cafeeb74a86c4a11c200b9
parentcdfd7573ecb1e838e755d178022faa0df171df1a (diff)
downloadandroid_external_libavc-7a54468cf8b56745d371baf83694c87a563907fc.tar.gz
android_external_libavc-7a54468cf8b56745d371baf83694c87a563907fc.tar.bz2
android_external_libavc-7a54468cf8b56745d371baf83694c87a563907fc.zip
Decoder: Initialize first_pb_nal_in_pic for error slices
first_pb_nal_in_pic was uninitialized for error clips Bug: 29023649 Change-Id: Ie4e0a94059c5f675bf619e31534846e2c2ca58ae
-rw-r--r--decoder/ih264d_api.c1
-rw-r--r--decoder/ih264d_parse_slice.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c
index 8dc9daf..55e3cd4 100644
--- a/decoder/ih264d_api.c
+++ b/decoder/ih264d_api.c
@@ -2878,6 +2878,7 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op)
ps_dec->cur_dec_mb_num = 0;
ps_dec->cur_recon_mb_num = 0;
ps_dec->u4_first_slice_in_pic = 2;
+ ps_dec->u1_first_pb_nal_in_pic = 1;
ps_dec->u1_slice_header_done = 0;
ps_dec->u1_dangling_field = 0;
diff --git a/decoder/ih264d_parse_slice.c b/decoder/ih264d_parse_slice.c
index e3e5e3b..910015b 100644
--- a/decoder/ih264d_parse_slice.c
+++ b/decoder/ih264d_parse_slice.c
@@ -954,7 +954,6 @@ WORD32 ih264d_end_of_pic(dec_struct_t *ps_dec,
dec_slice_params_t *ps_cur_slice = ps_dec->ps_cur_slice;
WORD32 ret;
- ps_dec->u1_first_pb_nal_in_pic = 1;
ps_dec->u2_mbx = 0xffff;
ps_dec->u2_mby = 0;
{