some small fixes

Removed unnecessary commented codes. Set swr_convert() not to change channel
layout by letting both in and out channel layout be the default channel layout
according to the number of channels.

Also fixed some indentations.