Fix missing multichannel SAD in some cases (done by Anssi)
Merge pull request #2740 from fritsch/master

Fix missing multichannel SAD in some cases (done by Anssi)