[FFmpeg-cvslog] Merge commit '2157df425bd909854fd4afcec4aa3311d8a3b31b'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Thu Aug 27 09:49:21 2015 +0200| [540f2800980e63ebe2db97cec429c54cdec231a6] | committer: Hendrik Leppkes

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 at gmail.com>

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