[FFmpeg-cvslog] Merge commit 'a46a4f722d2fac07c57990f0f548777622599f59'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Oct 21 14:19:07 2017 -0300| [157dc1495135ff8b79ef4ca23dac8c9de008e34b] | committer: James Almer

Merge commit 'a46a4f722d2fac07c57990f0f548777622599f59'

* commit 'a46a4f722d2fac07c57990f0f548777622599f59':
  dca: Refactor dca_filter_channels() a little
  dca: Validate the channel map

This commit is a noop, we have a different DCA decoder.

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

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