channel order from the decoder rather than the default FFmpeg channel order.

Originally committed as revision 20508 to svn://svn.ffmpeg.org/ffmpeg/trunk