Merge master.

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

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 27b36e9bc65ed73358ae36ef2da2adb32c607f77..d32769b5a9dde2ec41128207983e04b9721b8c0e 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -62,6 +62,7 @@ public:
        static std::vector<VideoContentScale> all () {
                return _scales;
        }
+       static VideoContentScale from_id (std::string id);
 
 private:
        /** a ratio to stretch the content to, or 0 for no stretch */