Browse Source

Merge commit '3d95d27376e59de14f984e7a22a52e066d85df35'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.2-rc1
Michael Niedermayer 11 years ago
parent
commit
fadec4f6db
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavresample/audio_mix.c

+ 1
- 1
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) {
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) {


Loading…
Cancel
Save