diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-27 09:49:21 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-27 09:49:21 +0200 |
| commit | 540f2800980e63ebe2db97cec429c54cdec231a6 (patch) | |
| tree | c261e4355fdedafb8c69e046d9186e771f77f77e /libavcodec/sonic.c | |
| parent | 427598a2f423eb3374ab4c33777c77de2290a324 (diff) | |
| parent | 2157df425bd909854fd4afcec4aa3311d8a3b31b (diff) | |
| download | ffmpeg-540f2800980e63ebe2db97cec429c54cdec231a6.tar.gz | |
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>
Diffstat (limited to 'libavcodec/sonic.c')
0 files changed, 0 insertions, 0 deletions