Commit ee69229d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '7a5f4447'

* commit '7a5f4447':
  avisynth: Bump minimum required version to interface version 6

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

See: 3723a183Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 64b37d3e 7a5f4447
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment