Merge master.

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

diff --git a/src/lib/image_content.h b/src/lib/image_content.h
index ef2bc0447c9262e13357154f5f3c313996bccfb3..6db24767d5af5850a418444f204f69b896bb6f5b 100644 (file)
--- a/src/lib/image_content.h
+++ b/src/lib/image_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -45,8 +45,9 @@ public:
 
        std::string identifier () const;
        
-       void set_video_length (VideoFrame);
+       void set_video_length (ContentTime);
        bool still () const;
+       void set_video_frame_rate (float);
 };
 
 #endif