summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarish Mahendrakar <harish.mahendrakar@ittiam.com>2016-06-13 11:58:50 +0530
committerThe Android Automerger <android-build@google.com>2016-06-23 15:05:09 -0700
commit326fe991a4b7971e8aeaf4ac775491dd8abd85bb (patch)
tree016235befa6dbf6dc649a092bae77a78a9231aa8
parent7554755536019e439433c515eeb44e701fb3bfb2 (diff)
downloadandroid_external_libavc-326fe991a4b7971e8aeaf4ac775491dd8abd85bb.tar.gz
android_external_libavc-326fe991a4b7971e8aeaf4ac775491dd8abd85bb.tar.bz2
android_external_libavc-326fe991a4b7971e8aeaf4ac775491dd8abd85bb.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 cef51b0..801960b 100644
--- a/decoder/ih264d_api.c
+++ b/decoder/ih264d_api.c
@@ -1895,6 +1895,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 73bc45d..911b11d 100644
--- a/decoder/ih264d_parse_slice.c
+++ b/decoder/ih264d_parse_slice.c
@@ -940,7 +940,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;
{