diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-03 00:11:49 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-03 00:11:49 +0000 |
| commit | 589df1b98784efaa39b3ace30d219987792b6666 (patch) | |
| tree | 01ce6bda9284323729579168954a34a8286d4096 | |
| parent | 81d2ac706fc04de2d2a4123b7f75494540947947 (diff) | |
| parent | cbab56691b9544a899d38abc65a577196bd54f3c (diff) | |
| download | android_external_libavc-589df1b98784efaa39b3ace30d219987792b6666.tar.gz android_external_libavc-589df1b98784efaa39b3ace30d219987792b6666.tar.bz2 android_external_libavc-589df1b98784efaa39b3ace30d219987792b6666.zip | |
Merge cherrypicks of [3551537, 3552808, 3552809, 3551513, 3551514, 3554326, 3555207, 3555208, 3555209, 3555210, 3552110, 3555154, 3555155] into oc-m2-release
Change-Id: Ia208272a5bcd3840b8785bc72a5652ac80e1b616
| -rw-r--r-- | decoder/ih264d_parse_headers.c | 4 | ||||
| -rw-r--r-- | decoder/ih264d_parse_slice.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/decoder/ih264d_parse_headers.c b/decoder/ih264d_parse_headers.c index f0d0d88..03ed508 100644 --- a/decoder/ih264d_parse_headers.c +++ b/decoder/ih264d_parse_headers.c @@ -30,6 +30,8 @@ * \author AI ************************************************************************** */ +#include <string.h> + #include "ih264_typedefs.h" #include "ih264_macros.h" #include "ih264_platform_macros.h" @@ -564,6 +566,8 @@ WORD32 ih264d_parse_sps(dec_struct_t *ps_dec, dec_bit_stream_t *ps_bitstrm) /*--------------------------------------------------------------------*/ ps_seq = ps_dec->pv_scratch_sps_pps; + memset(ps_seq, 0, sizeof(dec_seq_params_t)); + if(ps_dec->i4_header_decoded & 1) { *ps_seq = *ps_dec->ps_cur_sps; diff --git a/decoder/ih264d_parse_slice.c b/decoder/ih264d_parse_slice.c index 609c2fe..db02bfe 100644 --- a/decoder/ih264d_parse_slice.c +++ b/decoder/ih264d_parse_slice.c @@ -1826,7 +1826,7 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice, ps_dec->ps_cur_pic->u4_pack_slc_typ |= I_SLC_BIT; ret = ih264d_parse_islice(ps_dec, u2_first_mb_in_slice); - + ps_dec->u1_pr_sl_type = u1_slice_type; if(ps_dec->i4_pic_type != B_SLICE && ps_dec->i4_pic_type != P_SLICE) ps_dec->i4_pic_type = I_SLICE; |