Merge commit '11db644a8e54f02e54d2eaad343a87fcb697c15e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Aug 2014 19:42:49 +0000 (21:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Aug 2014 19:43:06 +0000 (21:43 +0200)
* commit '11db644a8e54f02e54d2eaad343a87fcb697c15e':
  lavr: Update the planar check in ff_audio_convert

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

Simple merge