summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Shih <robertshih@google.com>2016-06-21 19:01:42 (GMT)
committerandroid-build-merger <android-build-merger@google.com>2016-06-21 19:01:42 (GMT)
commitac9332c9ac4d9b77ceb2a120ebf77470e85dbf3a (patch)
tree78955bbf9a7d2d56cd89c1d0dba6b5ae9245856b
parent49f36805b35a5dabbb6421cabc17f90dd514c7c0 (diff)
parentc4ef0f612996f7802c927d4f819752f6591b6e61 (diff)
downloadandroid_external_libavc-staging/cm-14.0.zip
android_external_libavc-staging/cm-14.0.tar.gz
android_external_libavc-staging/cm-14.0.tar.bz2
Merge \\\\"Decoder: Initialize first_pb_nal_in_pic for error slices\\\\" into mnc-dev am: b9d7cba8bf am: c73e000665 am: 59248aa67cstaging/cm-14.0
am: c4ef0f6129 Change-Id: I57e93af0f4f9d3f3f2d0cbbccbf21397602cc87a
-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;
{