[FFmpeg-cvslog] Merge commit '6bcd3e05998b41fb3b2c8dcc79e4662854e5208d'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Mon Sep  7 12:24:51 2015 +0200| [7e272100c9834b694d339f8578f28799a35607fc] | committer: Hendrik Leppkes

Merge commit '6bcd3e05998b41fb3b2c8dcc79e4662854e5208d'

* commit '6bcd3e05998b41fb3b2c8dcc79e4662854e5208d':
  build: Add support for travis CI

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

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