virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/resample: Use av_m/realloc_array()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-07-17 16:33:17 +02:00
parent ad516dd271
commit dca22ab055
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/resample.c
View File

@@ -347,10 +347,10 @@ int audio_resample(ReSampleContext *s, short *output, short *input, int nb_sampl
/* XXX: move those malloc to resample init code */ /* XXX: move those malloc to resample init code */
for (i = 0; i < s->filter_channels; i++) { for (i = 0; i < s->filter_channels; i++) {
bufin[i] = av_malloc((nb_samples + s->temp_len) * sizeof(short)); bufin[i] = av_malloc_array((nb_samples + s->temp_len), sizeof(short));
memcpy(bufin[i], s->temp[i], s->temp_len * sizeof(short)); memcpy(bufin[i], s->temp[i], s->temp_len * sizeof(short));
buftmp2[i] = bufin[i] + s->temp_len; buftmp2[i] = bufin[i] + s->temp_len;
bufout[i] = av_malloc(lenout * sizeof(short)); bufout[i] = av_malloc_array(lenout, sizeof(short));
} }
if (s->input_channels == 2 && s->output_channels == 1) { if (s->input_channels == 2 && s->output_channels == 1) {
@@ -384,7 +384,7 @@ int audio_resample(ReSampleContext *s, short *output, short *input, int nb_sampl
nb_samples1 = av_resample(s->resample_context, buftmp3[i], bufin[i], nb_samples1 = av_resample(s->resample_context, buftmp3[i], bufin[i],
&consumed, nb_samples, lenout, is_last); &consumed, nb_samples, lenout, is_last);
s->temp_len = nb_samples - consumed; s->temp_len = nb_samples - consumed;
s->temp[i] = av_realloc(s->temp[i], s->temp_len * sizeof(short)); s->temp[i] = av_realloc_array(s->temp[i], s->temp_len, sizeof(short));
memcpy(s->temp[i], bufin[i] + consumed, s->temp_len * sizeof(short)); memcpy(s->temp[i], bufin[i] + consumed, s->temp_len * sizeof(short));
} }