[FFmpeg-cvslog] Merge commit 'cad40a3833ad81a352e7657ec6f7d637cea3b798'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Sep  5 17:05:46 2015 +0200| [41194f065c8e9b138db069417494e2f845c7b275] | committer: Hendrik Leppkes

Merge commit 'cad40a3833ad81a352e7657ec6f7d637cea3b798'

* commit 'cad40a3833ad81a352e7657ec6f7d637cea3b798':
  lavc: Drop deprecated deinterlace module

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

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