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)
* commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd':
  lavr: Do not change the sample format for mono audio

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

Simple merge
Simple merge
Simple merge
Simple merge