diff options
| author | Robert Shih <robertshih@google.com> | 2016-06-21 18:47:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-21 18:47:11 +0000 |
| commit | b9d7cba8bf0ad47bf0b0faae5bb53a13e23006a2 (patch) | |
| tree | 85d1224dd7abf38337cae90049f62fe29df6f7a7 | |
| parent | 3a419eac8d70cc2ef517d3aa7f9c40c4b7d98cbe (diff) | |
| parent | 7a54468cf8b56745d371baf83694c87a563907fc (diff) | |
| download | android_external_libavc-b9d7cba8bf0ad47bf0b0faae5bb53a13e23006a2.tar.gz android_external_libavc-b9d7cba8bf0ad47bf0b0faae5bb53a13e23006a2.tar.bz2 android_external_libavc-b9d7cba8bf0ad47bf0b0faae5bb53a13e23006a2.zip | |
Merge "Decoder: Initialize first_pb_nal_in_pic for error slices" into mnc-dev
| -rw-r--r-- | decoder/ih264d_api.c | 1 | ||||
| -rw-r--r-- | decoder/ih264d_parse_slice.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c index a8dea4f..17dfae4 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 41c73c3..73c0da4 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; { |