* commit '0e8c6f22':
  avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typo

Conflicts:
	doc/general.texi
	libavformat/avisynth.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>