Slight modification of mixing function
Merge pull request #112 from antihax/Opt

Slight modification of audio mixing function
Remove property list prefill code in mac-avcapture
Merge remote-tracking branch 'remotes/upstream/master'