Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert...

[dcpomatic.git] / src / lib / util.h

diff --git a/src/lib/util.h b/src/lib/util.h
index f5d0b3acac066cd4ef2e9283e2a360628e9f1e6b..1c122b70c9e018f4ddefc392c356d6b6d841b925 100644 (file)
--- 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.