diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-09-07 23:36:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-09-07 23:36:40 +0100 |
| commit | 5dc2dbdb6639f8d617a40209ad603d2a38f9df2a (patch) | |
| tree | 849db948bfed659df5a9f5bfb2bdb8519c313de6 /src/lib/video_content.h | |
| parent | a4d3b0b6b1069b08fff0559f63d73bb7353256bd (diff) | |
| parent | 38fd8d2d230a239079ffdf3e10a48833ade6e8c5 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/video_content.h')
| -rw-r--r-- | src/lib/video_content.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/video_content.h b/src/lib/video_content.h index 27b36e9bc..d32769b5a 100644 --- 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 */ |