diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2016-05-25 23:26:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-25 23:26:43 +0000 |
| commit | 4abe7805da3b604885366ff97cfdba797a303544 (patch) | |
| tree | bd680df3086123de70e0a839c2faee78f30f914b | |
| parent | e209d37db763d44ae9b741dfb9040d444016c0a1 (diff) | |
| parent | b70297ef4b97b25696535d0032b3d371674f77bc (diff) | |
| download | android_external_libavc-4abe7805da3b604885366ff97cfdba797a303544.tar.gz android_external_libavc-4abe7805da3b604885366ff97cfdba797a303544.tar.bz2 android_external_libavc-4abe7805da3b604885366ff97cfdba797a303544.zip | |
Fix slice params for interlaced video am: 2c9d67ffaf
am: b70297ef4b
* commit 'b70297ef4b97b25696535d0032b3d371674f77bc':
Fix slice params for interlaced video
Change-Id: Ic3b282d658e6dcbe6ab01c99c4289c7aa8c6a7d4
| -rw-r--r-- | decoder/ih264d_api.c | 1 | ||||
| -rw-r--r-- | decoder/ih264d_parse_pslice.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c index 82226f3..e2fa322 100644 --- a/decoder/ih264d_api.c +++ b/decoder/ih264d_api.c @@ -1103,6 +1103,7 @@ void ih264d_init_decoder(void * ps_dec_params) (MAX_DISP_BUFS_NEW) * sizeof(UWORD32)); memset(ps_dec->u4_disp_buf_to_be_freed, 0, (MAX_DISP_BUFS_NEW) * sizeof(UWORD32)); + memset(ps_dec->ps_cur_slice, 0, sizeof(dec_slice_params_t)); ih264d_init_arch(ps_dec); ih264d_init_function_ptr(ps_dec); diff --git a/decoder/ih264d_parse_pslice.c b/decoder/ih264d_parse_pslice.c index 1127838..a751a88 100644 --- a/decoder/ih264d_parse_pslice.c +++ b/decoder/ih264d_parse_pslice.c @@ -1495,8 +1495,6 @@ WORD32 ih264d_mark_err_slice_skip(dec_struct_t * ps_dec, j = i; { //initialize slice params required by ih264d_start_of_pic to valid values - ps_dec->ps_cur_slice->u1_bottom_field_flag = 0; - ps_dec->ps_cur_slice->u1_field_pic_flag = 0; ps_dec->ps_cur_slice->u1_slice_type = P_SLICE; ps_dec->ps_cur_slice->u1_nal_ref_idc = 1; ps_dec->ps_cur_slice->u1_nal_unit_type = 1; |