projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various subtitle UI tweaks.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_content.cc
diff --git
a/src/lib/ffmpeg_content.cc
b/src/lib/ffmpeg_content.cc
index d3e0fa7b25687010a18cc2797db9aa9a76df3483..a12f45a30f81d20d6af73fb97e0b62f805a54a54 100644
(file)
--- a/
src/lib/ffmpeg_content.cc
+++ b/
src/lib/ffmpeg_content.cc
@@
-110,7
+110,7
@@
FFmpegContent::FFmpegContent (shared_ptr<const Film> f, vector<boost::shared_ptr
for (size_t i = 0; i < c.size(); ++i) {
shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (c[i]);
for (size_t i = 0; i < c.size(); ++i) {
shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (c[i]);
- if (f
->with_subtitles
() && *(fc->_subtitle_stream.get()) != *(ref->_subtitle_stream.get())) {
+ if (f
c->subtitle_use
() && *(fc->_subtitle_stream.get()) != *(ref->_subtitle_stream.get())) {
throw JoinError (_("Content to be joined must use the same subtitle stream."));
}
throw JoinError (_("Content to be joined must use the same subtitle stream."));
}