diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-07-13 20:31:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-07-13 20:31:22 +0000 |
| commit | d191a180be726a7f6db809a1b19d5bd857244ef2 (patch) | |
| tree | f9a0f185b832078bf06443196a4cb1cb0109710f /decoder/ixheaacd_mps_dec.h | |
| parent | a5c232f0d2a905950ba6da353763f4d3abb0f55c (diff) | |
| parent | ffaed483f894280e677a6ee73f51e25954d209dd (diff) | |
| download | libxaac-d191a180be726a7f6db809a1b19d5bd857244ef2.tar.gz | |
Merge "Fix for segmentation fault in ixheaacd_sbr_dec_from_mps"
Diffstat (limited to 'decoder/ixheaacd_mps_dec.h')
| -rw-r--r-- | decoder/ixheaacd_mps_dec.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/decoder/ixheaacd_mps_dec.h b/decoder/ixheaacd_mps_dec.h index 03c93a0..cd554df 100644 --- a/decoder/ixheaacd_mps_dec.h +++ b/decoder/ixheaacd_mps_dec.h @@ -339,7 +339,7 @@ typedef struct ia_mps_dec_state_struct { VOID ixheaacd_mps_init_pre_and_post_matrix(ia_mps_dec_state_struct *self); VOID ixheaacd_pre_and_mix_matrix_calculation(ia_mps_dec_state_struct *self); -VOID ixheaacd_mps_apply_pre_matrix(ia_mps_dec_state_struct *self); +WORD32 ixheaacd_mps_apply_pre_matrix(ia_mps_dec_state_struct *self); VOID ixheaacd_mps_apply_mix_matrix(ia_mps_dec_state_struct *self); VOID ixheaacd_mps_config(ia_mps_dec_state_struct *self, WORD32 frame_len, @@ -371,7 +371,7 @@ VOID ixheaacd_mps_par2umx_pred(ia_mps_dec_state_struct *self, WORD32 *h_real, WORD32 param_set_idx, WORD32 res_bands); -VOID ixheaacd_mps_upmix_interp( +WORD32 ixheaacd_mps_upmix_interp( WORD32 m_matrix[MAX_PARAMETER_SETS_MPS][MAX_PARAMETER_BANDS][MAX_M_OUTPUT] [MAX_M_INPUT], WORD32 r_matrix[MAX_TIME_SLOTS][MAX_PARAMETER_BANDS][MAX_M_OUTPUT] |