[FFmpeg-cvslog] Merge commit '5352802da81f2083e65d466612e639a4e6e5530e'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Oct 28 15:06:08 2017 -0300| [7d829da3f91984240bae05325f1f7538d31f605b] | committer: James Almer

Merge commit '5352802da81f2083e65d466612e639a4e6e5530e'

* commit '5352802da81f2083e65d466612e639a4e6e5530e':
  dca: Account for lfe when checking for the channel count

This commit is a noop.

Merged-by: James Almer <jamrial at gmail.com>

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