projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Primitive subtitle export feature.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_encoder.cc
diff --git
a/src/lib/ffmpeg_encoder.cc
b/src/lib/ffmpeg_encoder.cc
index 572e7ae16080ef7b8bc2a44bf781a0defe2299d7..49908587bca88cdd17c257d967423409a972229d 100644
(file)
--- a/
src/lib/ffmpeg_encoder.cc
+++ b/
src/lib/ffmpeg_encoder.cc
@@
-183,7
+183,7
@@
FFmpegEncoder::go ()
}
}
-float
+optional<float>
FFmpegEncoder::current_rate () const
{
return _history.rate ();