Merge commit '7a5f44476696b495e0de658ed859bcb8520b93d4'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Apr 2015 18:09:44 +0000 (20:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Apr 2015 18:10:08 +0000 (20:10 +0200)
* commit '7a5f44476696b495e0de658ed859bcb8520b93d4':
  avisynth: Bump minimum required version to interface version 6

Conflicts:
doc/general.texi
libavformat/avisynth.c

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

Trivial merge