[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 28 13:03:09 2013 +0200| [48480da6ad0f53e8d9d68162e8d003f557221fc2] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: document the asf demuxer

Conflicts:
	doc/demuxers.texi

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=48480da6ad0f53e8d9d68162e8d003f557221fc2
---