[FFmpeg-cvslog] Merge commit 'c0771a1ac6da697f86e3b10c8fe5dbc2ee92e347'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 17 15:13:07 2013 +0200| [f60ba6c52418a42c5a59a6b9d1e8c13b41c961e3] | committer: Michael Niedermayer

Merge commit 'c0771a1ac6da697f86e3b10c8fe5dbc2ee92e347'

* commit 'c0771a1ac6da697f86e3b10c8fe5dbc2ee92e347':
  af_channelmap: cosmetics, use an extra local variable to shorten the code

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

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