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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 11 21:19:46 2014 +0100| [50a3c823023bbbcdb64375cb64cfbb67c98698a9] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: Add section about AviSynth support

Conflicts:
	doc/general.texi

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

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