OSDN Git Service

Merge commit '3d95d27376e59de14f984e7a22a52e066d85df35'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 01:11:29 +0000 (02:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 01:11:33 +0000 (02:11 +0100)
commitfadec4f6dbc77b74e5b868ef206ecc560da639fb
tree9a3404d85eb334085dcd9da54c8ee08ea9f8966b
parent8e6af036b95784b6e2411c18a979c496cd69fc29
parent3d95d27376e59de14f984e7a22a52e066d85df35
Merge commit '3d95d27376e59de14f984e7a22a52e066d85df35'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavresample/audio_mix.c