diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-01 08:55:32 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-01 08:55:32 +0000 |
commit | 4b38cffeeade2bf754d9cab89690b2a54ef2c60d (patch) | |
tree | 36462620d9b1c81dfe205d380d91df9c98e8c639 | |
parent | 7464a99e35cd9c5b51cf66ba995293551b8c84f9 (diff) | |
parent | 99702d3aefa2dda519fb434c4bf6aaa657f66a04 (diff) | |
download | android_external_libavc-4b38cffeeade2bf754d9cab89690b2a54ef2c60d.tar.gz android_external_libavc-4b38cffeeade2bf754d9cab89690b2a54ef2c60d.tar.bz2 android_external_libavc-4b38cffeeade2bf754d9cab89690b2a54ef2c60d.zip |
Snap for 4579913 from 99702d3aefa2dda519fb434c4bf6aaa657f66a04 to pi-release
Change-Id: I8572f5abd4be00e41caaba77f0ad395795b7074e
-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; |