[FFmpeg-cvslog] Merge commit 'a6a45e5a9a9dfb725456f62e053532e505aadcfc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 14 20:07:07 2015 +0200| [64b37d3e08e48419c85f35724d119267e89d575d] | committer: Michael Niedermayer

Merge commit 'a6a45e5a9a9dfb725456f62e053532e505aadcfc'

* commit 'a6a45e5a9a9dfb725456f62e053532e505aadcfc':
  avisynth: Fix detection of AviSynth 2.5

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64b37d3e08e48419c85f35724d119267e89d575d
---