projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
427598a
2157df4
)
Merge commit '2157df425bd909854fd4afcec4aa3311d8a3b31b'
author
Hendrik Leppkes
<h.leppkes@gmail.com>
Thu, 27 Aug 2015 07:49:21 +0000
(09:49 +0200)
committer
Hendrik 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