projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Take y scale into account when deciding subtitle line spacing.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_decoder.cc
diff --git
a/src/lib/ffmpeg_decoder.cc
b/src/lib/ffmpeg_decoder.cc
index df6b7416b35a2fc521846ed91ec490e6faaef45d..164785c8368bb0fbffea1a28d468247df4eadf47 100644
(file)
--- a/
src/lib/ffmpeg_decoder.cc
+++ b/
src/lib/ffmpeg_decoder.cc
@@
-75,7
+75,7
@@
using boost::is_any_of;
using boost::split;
using dcp::Size;
using boost::split;
using dcp::Size;
-FFmpegDecoder::FFmpegDecoder (shared_ptr<const FFmpegContent> c, shared_ptr<Log> log
, bool fast
)
+FFmpegDecoder::FFmpegDecoder (shared_ptr<const FFmpegContent> c, shared_ptr<Log> log)
: FFmpeg (c)
, _log (log)
{
: FFmpeg (c)
, _log (log)
{
@@
-87,7
+87,7
@@
FFmpegDecoder::FFmpegDecoder (shared_ptr<const FFmpegContent> c, shared_ptr<Log>
}
if (c->audio) {
}
if (c->audio) {
- audio.reset (new AudioDecoder (this, c->audio,
fast,
log));
+ audio.reset (new AudioDecoder (this, c->audio, log));
}
if (c->subtitle) {
}
if (c->subtitle) {