Merge commit '1188119624e42c1b2ce5be6137d2e6c6f4f03328'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Mar 2015 10:54:38 +0000 (11:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Mar 2015 11:04:21 +0000 (12:04 +0100)
* commit '1188119624e42c1b2ce5be6137d2e6c6f4f03328':
  avisynth: update documentation about the avisynth_c.h header

Conflicts:
doc/general.texi

Not merged as FFmpeg provides the needed headers in compat/

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

Trivial merge