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/util.h | |
| parent | ab32f60c2c9f2ad01dc8d96dc375df256dba0c41 (diff) | |
Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert()s with thrown exceptions.
Diffstat (limited to 'src/lib/util.h')
| -rw-r--r-- | src/lib/util.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/util.h b/src/lib/util.h index f5d0b3aca..1c122b70c 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -27,7 +27,8 @@ #include "compose.hpp" #include "types.h" -#include "video_content.h" +#include "exceptions.h" +#include "dcpomatic_time.h" #include <dcp/util.h> extern "C" { #include <libavcodec/avcodec.h> @@ -125,7 +126,7 @@ private: int _timeout; }; -extern int64_t video_frames_to_audio_frames (VideoContent::Frame v, float audio_sample_rate, float frames_per_second); +extern int64_t video_frames_to_audio_frames (VideoFrame v, float audio_sample_rate, float frames_per_second); /** @class ScopedTemporary * @brief A temporary file which is deleted when the ScopedTemporary object goes out of scope. |