Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 00:49:43 +0000 (02:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 00:49:48 +0000 (02:49 +0200)
commitc62fea75747de132d69cdf8504ab6c8af26fa307
treeaa43d49d22eff48477167fd9aa359637015b7185
parent8f6d36b3cb8e3afc6cfa3abb1582ec4d71a3e1ee
parentfbc0b8659967ea54a8472b5f795270d38bb085dd
Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'

* commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd':
  lavr: Do not change the sample format for mono audio

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavresample/audio_convert.c
libavresample/audio_data.c
libavresample/audio_data.h
libavresample/utils.c