[FFmpeg-cvslog] Merge commit 'e65e4cbbda03ca3c9087f069c9867d518415fca1'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Sep  5 16:11:22 2015 +0200| [43e2e172dfbd734947c30bdbfa8f19b7ca95576d] | committer: Hendrik Leppkes

Merge commit 'e65e4cbbda03ca3c9087f069c9867d518415fca1'

* commit 'e65e4cbbda03ca3c9087f069c9867d518415fca1':
  lavfi: Drop deprecated *_count suffixed variables

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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