diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-20 23:01:12 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-20 23:01:12 +0100 |
| commit | dc1c279211773ad68cb0348eb802cf5c9594d8dd (patch) | |
| tree | d49cd367d1832ce04bbc041b866835b2463d29d7 /src/lib/ffmpeg_content.cc | |
| parent | 4d54b053b6e9565e026554b1dba31d73a1b492ae (diff) | |
Various subtitle UI tweaks.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index d3e0fa7b2..a12f45a30 100644 --- 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]); - if (f->with_subtitles() && *(fc->_subtitle_stream.get()) != *(ref->_subtitle_stream.get())) { + if (fc->subtitle_use() && *(fc->_subtitle_stream.get()) != *(ref->_subtitle_stream.get())) { throw JoinError (_("Content to be joined must use the same subtitle stream.")); } |