[FFmpeg-cvslog] Merge commit 'a8c99205ca8703bd849efae13fcf844315c7147d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 24 11:24:21 2015 +0100| [153073201cdcfd641042114b2bd39b00a532cbb9] | committer: Michael Niedermayer

Merge commit 'a8c99205ca8703bd849efae13fcf844315c7147d'

* commit 'a8c99205ca8703bd849efae13fcf844315c7147d':
  avisynth: Fix compilation against current 2.6 header(s).

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

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