[FFmpeg-cvslog] Merge commit '2b9ee7d5b901e0d7ba617511e4ed31d3043894d3' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 15 02:40:44 2014 +0100| [29df24252aa920dfa7ad538b76b7f03d68f8e426] | committer: Michael Niedermayer

Merge commit '2b9ee7d5b901e0d7ba617511e4ed31d3043894d3' into release/2.2

* commit '2b9ee7d5b901e0d7ba617511e4ed31d3043894d3':
  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=29df24252aa920dfa7ad538b76b7f03d68f8e426
---