Merge commit '2157df425bd909854fd4afcec4aa3311d8a3b31b'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 27 Aug 2015 07:49:21 +0000 (09:49 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 27 Aug 2015 07:49:21 +0000 (09:49 +0200)
* commit '2157df425bd909854fd4afcec4aa3311d8a3b31b':
  hlsenc: Support outputting specific versions

Not merged, the version is auto-selected in ffmpeg based on enabled features.

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

Trivial merge