[FFmpeg-cvslog] Merge commit '1336bb06c9fbf9a14765e9f78616f2aad4f3a45a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 17 20:23:28 2015 +0200| [04fbab1477455993e80f0f189c13595ef4e0277c] | committer: Michael Niedermayer

Merge commit '1336bb06c9fbf9a14765e9f78616f2aad4f3a45a'

* commit '1336bb06c9fbf9a14765e9f78616f2aad4f3a45a':
  configure: Simplify avisynth check

Conflicts:
	configure

No change as check_lib2 was already used

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

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