[FFmpeg-cvslog] Merge commit 'aafed1175df76603e94c99a7748968780d6548d2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 17 15:04:16 2013 +0200| [74e86d3147cc0c0af89b5c512fe94e19873a35a1] | committer: Michael Niedermayer

Merge commit 'aafed1175df76603e94c99a7748968780d6548d2'

* commit 'aafed1175df76603e94c99a7748968780d6548d2':
  af_channelmap: sanity check input channel indices in all cases.

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

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