[FFmpeg-cvslog] Merge commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  1 10:16:27 2013 +0200| [e41d3aba0123c1089b55aa7dc6371973a0c3a39e] | committer: Michael Niedermayer

Merge commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8'

* commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8':
  graphparser: only print filter arguments if they are non-NULL
  af_channelmap: ensure the output channel layout is valid.

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

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