Bug 842176 - Partial revert of bug 839319; use WAVE_FORMATEX when channels <= 2.  r=doublec