* commit '0955e57a':
  daud: split muxer and demuxer

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