[FFmpeg-cvslog] Merge commit '3d95d27376e59de14f984e7a22a52e066d85df35'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan  4 02:11:29 2014 +0100| [fadec4f6dbc77b74e5b868ef206ecc560da639fb] | committer: Michael Niedermayer

Merge commit '3d95d27376e59de14f984e7a22a52e066d85df35'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fadec4f6dbc77b74e5b868ef206ecc560da639fb
---