Merge commit 'aafed1175df76603e94c99a7748968780d6548d2'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Apr 2013 13:04:16 +0000 (15:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Apr 2013 13:04:22 +0000 (15:04 +0200)
commit74e86d3147cc0c0af89b5c512fe94e19873a35a1
treea1bd702a40e4763a4c2ae78c4c82ce65df6c781d
parentb725202546da366772dec1ada40ce36832582ed9
parentaafed1175df76603e94c99a7748968780d6548d2
Merge commit 'aafed1175df76603e94c99a7748968780d6548d2'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/af_channelmap.c