Merge commit '6536da7371b4847a2824ed46b98829f127f24dad'

* commit '6536da7371b4847a2824ed46b98829f127f24dad':
  doc: Add travis badge

Not merged as ffmpeg does not have travis officially setup.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
pull/151/head
Hendrik Leppkes 9 years ago
commit 5de28d341f

Diff Content Not Available