diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-05-15 20:48:48 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-05-21 21:35:05 +0100 |
| commit | 1e1dc6d6d15a5c20d61fd084fa305162c93f47c9 (patch) | |
| tree | 9105b96d6d8140e024cf3035232ecee8646062a5 /src/lib/ffmpeg_encoder.cc | |
| parent | d5ece4a49930f905b767855e4310bae74b7fdac8 (diff) | |
Fix up ChangeLog and cherry-pick 011d403 from master: fix missing burn-in/preview with subtitles containing ampersands.
Diffstat (limited to 'src/lib/ffmpeg_encoder.cc')
0 files changed, 0 insertions, 0 deletions