* commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8': avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typo Conflicts: doc/general.texi libavformat/avisynth.c Merged-by: Michael Niedermayer <michaelni@gmx.at>