Merge commit '7a5f44476696b495e0de658ed859bcb8520b93d4'

* 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>
This commit is contained in:
Michael Niedermayer 2015-04-14 20:09:44 +02:00
commit ee69229dd8

Diff Content Not Available