[FFmpeg-cvslog] Merge commit '11db644a8e54f02e54d2eaad343a87fcb697c15e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 17 21:42:49 2014 +0200| [c939eea107c36b4ab93540f24fdb1cb5417a0eae] | committer: Michael Niedermayer

Merge commit '11db644a8e54f02e54d2eaad343a87fcb697c15e'

* commit '11db644a8e54f02e54d2eaad343a87fcb697c15e':
  lavr: Update the planar check in ff_audio_convert

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

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