* commit 'b845f5e9':
  riff: Factor out WAVEFORMATEX parsing

Conflicts:
	libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>