diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-20 23:37:57 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-20 23:37:57 +0000 |
| commit | 4dbc6ef917aeceb906b1ef1caf6911033e7e2c54 (patch) | |
| tree | 203675d00d5cc004be6205218f835b6d7a10e925 /src/lib/ffmpeg_content.cc | |
| parent | ab32f60c2c9f2ad01dc8d96dc375df256dba0c41 (diff) | |
Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert()s with thrown exceptions.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index e09e71041..740efdc29 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -106,7 +106,7 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> f, vector<boost::shared_ptr , SubtitleContent (f, c) { shared_ptr<FFmpegContent> ref = dynamic_pointer_cast<FFmpegContent> (c[0]); - assert (ref); + DCPOMATIC_ASSERT (ref); for (size_t i = 0; i < c.size(); ++i) { shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (c[i]); @@ -173,7 +173,7 @@ FFmpegContent::examine (shared_ptr<Job> job, bool calculate_digest) take_from_video_examiner (examiner); shared_ptr<const Film> film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); { boost::mutex::scoped_lock lm (_mutex); @@ -315,7 +315,7 @@ DCPTime FFmpegContent::full_length () const { shared_ptr<const Film> film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); return DCPTime (video_length_after_3d_combine(), FrameRateChange (video_frame_rate (), film->video_frame_rate ())); } |