ffmpeg | branch: master | Vittorio Giovara <[email protected]> | Thu Oct 30 00:52:03 2014 +0000| [9f6f407463ff8b7681befd04b6655bb7c6d9b3e1] | committer: Vittorio Giovara
aacsbr: treat 1-d arrays as such CC: [email protected] Bug-Id: CID 1238802 / CID 1238793 / CID 1238785 CID 1238808 / CID 1238809 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f6f407463ff8b7681befd04b6655bb7c6d9b3e1 --- libavcodec/aacsbr.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c index 4d2ac6c..0363aff 100644 --- a/libavcodec/aacsbr.c +++ b/libavcodec/aacsbr.c @@ -1586,8 +1586,14 @@ static void sbr_hf_assemble(float Y1[38][64][2], memcpy(q_temp[i + 2*ch_data->t_env[0]], sbr->q_m[0], m_max * sizeof(sbr->q_m[0][0])); } } else if (h_SL) { - memcpy(g_temp[2*ch_data->t_env[0]], g_temp[2*ch_data->t_env_num_env_old], 4*sizeof(g_temp[0])); - memcpy(q_temp[2*ch_data->t_env[0]], q_temp[2*ch_data->t_env_num_env_old], 4*sizeof(q_temp[0])); + for (i = 0; i < 4; i++) { + memcpy(g_temp[i + 2 * ch_data->t_env[0]], + g_temp[i + 2 * ch_data->t_env_num_env_old], + sizeof(g_temp[0])); + memcpy(q_temp[i + 2 * ch_data->t_env[0]], + q_temp[i + 2 * ch_data->t_env_num_env_old], + sizeof(q_temp[0])); + } } for (e = 0; e < ch_data->bs_num_env; e++) { _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
