* commit '255d9c57':
  riff: Move demuxing code to a separate file.

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