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)
commit540f2800980e63ebe2db97cec429c54cdec231a6
treec261e4355fdedafb8c69e046d9186e771f77f77e
parent427598a2f423eb3374ab4c33777c77de2290a324
parent2157df425bd909854fd4afcec4aa3311d8a3b31b
Merge commit '2157df425bd909854fd4afcec4aa3311d8a3b31b'

* 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>