diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2016-06-21 18:59:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-21 18:59:01 +0000 |
| commit | c4ef0f612996f7802c927d4f819752f6591b6e61 (patch) | |
| tree | caa08fc3731238f47cf0af982ef5650fe609c033 | |
| parent | 44a2462a71503dafecfcac46de79c5b181a59746 (diff) | |
| parent | 59248aa67c19c55a717bd1fbe7eac4410662ea17 (diff) | |
| download | android_external_libavc-c4ef0f612996f7802c927d4f819752f6591b6e61.tar.gz android_external_libavc-c4ef0f612996f7802c927d4f819752f6591b6e61.tar.bz2 android_external_libavc-c4ef0f612996f7802c927d4f819752f6591b6e61.zip | |
Merge \\\"Decoder: Initialize first_pb_nal_in_pic for error slices\\\" into mnc-dev am: b9d7cba8bf am: c73e000665
am: 59248aa67c
Change-Id: Ie21d6e7b3d8499c0574de505c17988aef50fa9b4
| -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 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; { |