diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-22 22:51:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-22 22:52:01 +0100 |
| commit | 9353ed9e94a544b462be376e61aec9f62d684f56 (patch) | |
| tree | e23d30924a9350174b32b91d4e11dc7e18e175d3 /libavcodec/webvttenc.c | |
| parent | e32b07aea4981719a3e6ce92491349c9547958e1 (diff) | |
| parent | 6341ab0ad3fde9583138e121f518e21cde15258e (diff) | |
| download | ffmpeg-9353ed9e94a544b462be376e61aec9f62d684f56.tar.gz | |
Merge commit '6341ab0ad3fde9583138e121f518e21cde15258e'
* commit '6341ab0ad3fde9583138e121f518e21cde15258e':
libx265: Pass through user-set frame type
See: 41e983f1a63927dc0a2596cf2f0f7a946a048f11
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/webvttenc.c')
0 files changed, 0 insertions, 0 deletions