diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-05-14 00:14:38 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-05-14 00:14:38 +0100 |
| commit | 61e5cbfc5e2f376c544b246e40c5990bc090033f (patch) | |
| tree | 6313c7bb6cf57f8e0ae4403ca965d2c168902ca6 | |
| parent | 2199f765aca8727da11dd0f33f7dfc59e39bf455 (diff) | |
swaroop: fix incorrect start times with encrypted MP4 content.attic/swaroop-v2.15.x
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 4 | ||||
| -rw-r--r-- | src/wx/swaroop_controls.cc | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index e291b8e7c..97e12cc86 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -259,7 +259,9 @@ FFmpegContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job) ChangeSignaller<Content> cc1 (this, FFmpegContentProperty::SUBTITLE_STREAMS); ChangeSignaller<Content> cc2 (this, FFmpegContentProperty::SUBTITLE_STREAM); - job->set_progress_unknown (); + if (job) { + job->set_progress_unknown (); + } Content::examine (film, job); diff --git a/src/wx/swaroop_controls.cc b/src/wx/swaroop_controls.cc index c76ad590a..d8019a41e 100644 --- a/src/wx/swaroop_controls.cc +++ b/src/wx/swaroop_controls.cc @@ -471,6 +471,7 @@ SwaroopControls::select_playlist (int selected, int position) if (kdm) { try { ffmpeg->add_kdm (*kdm); + ffmpeg->examine (_film, shared_ptr<Job>()); } catch (KDMError& e) { error_dialog (this, "Could not load KDM."); } |