xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 12:09:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '3d95d27376e59de14f984e7a22a52e066d85df35'

Browse Source 
* commit '3d95d27376e59de14f984e7a22a52e066d85df35':
  audio_mix: initialize the data pointers to NULL

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-04 02:11:29 +01:00
commit fadec4f6db
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavresample/audio_mix.c
View File

@ -447,7 +447,7 @@ int ff_audio_mix(AudioMix *am, AudioData *src)
if (am->in_matrix_channels && am->out_matrix_channels) { if (am->in_matrix_channels && am->out_matrix_channels) {
uint8_t **data; uint8_t **data;
uint8_t *data0[AVRESAMPLE_MAX_CHANNELS]; uint8_t *data0[AVRESAMPLE_MAX_CHANNELS] = { NULL };
if (am->out_matrix_channels < am->out_channels || if (am->out_matrix_channels < am->out_channels ||
am->in_matrix_channels < am->in_channels) { am->in_matrix_channels < am->in_channels) {