* commit 'a7d45e06':
  configure: The W64 demuxer should select the WAV demuxer, not depend on it

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