* qatar/master:
  doc: document the asf demuxer

Conflicts:
	doc/demuxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>