diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-25 13:37:16 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-25 13:37:16 +0100 |
| commit | 5ce9c7026366d82233e8852b9b949362ed2f6191 (patch) | |
| tree | 5a1d1b3e1e6fc4d280f1ff0f1598a37e0fea3257 /src/lib/encoder.cc | |
| parent | dd1709b8535444a52fbe6264664e8172965311b5 (diff) | |
| parent | 89ee4cc6019036fa4fc0a6e07e052ffdc3b136ac (diff) | |
Merge branch 'content-burn-subs' into 2.0
Diffstat (limited to 'src/lib/encoder.cc')
| -rw-r--r-- | src/lib/encoder.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 93e15031d..c3ad08441 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -236,7 +236,6 @@ Encoder::enqueue (shared_ptr<PlayerVideo> pv) _film->video_frame_rate(), _film->j2k_bandwidth(), _film->resolution(), - _film->burn_subtitles(), _film->log() ) )); |