diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 02:11:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 02:11:33 +0100 |
| commit | fadec4f6dbc77b74e5b868ef206ecc560da639fb (patch) | |
| tree | 9a3404d85eb334085dcd9da54c8ee08ea9f8966b /libavresample | |
| parent | 8e6af036b95784b6e2411c18a979c496cd69fc29 (diff) | |
| parent | 3d95d27376e59de14f984e7a22a52e066d85df35 (diff) | |
| download | ffmpeg-fadec4f6dbc77b74e5b868ef206ecc560da639fb.tar.gz | |
Merge commit '3d95d27376e59de14f984e7a22a52e066d85df35'
* commit '3d95d27376e59de14f984e7a22a52e066d85df35':
audio_mix: initialize the data pointers to NULL
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
| -rw-r--r-- | libavresample/audio_mix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavresample/audio_mix.c b/libavresample/audio_mix.c index 1b48fe5600..878e5a9339 100644 --- a/libavresample/audio_mix.c +++ b/libavresample/audio_mix.c @@ -447,7 +447,7 @@ int ff_audio_mix(AudioMix *am, AudioData *src) if (am->in_matrix_channels && am->out_matrix_channels) { uint8_t **data; - uint8_t *data0[AVRESAMPLE_MAX_CHANNELS]; + uint8_t *data0[AVRESAMPLE_MAX_CHANNELS] = { NULL }; if (am->out_matrix_channels < am->out_channels || am->in_matrix_channels < am->in_channels) { |