projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
[dcpomatic.git]
/
src
/
lib
/
video_content.h
diff --git
a/src/lib/video_content.h
b/src/lib/video_content.h
index 84b3d2268bbd2006ed376f3f504edc68b21d3e2a..774210c13ff191eb37521b6be328a110d79035d1 100644
(file)
--- a/
src/lib/video_content.h
+++ b/
src/lib/video_content.h
@@
-51,7
+51,7
@@
public:
class VideoContent : public ContentPart, public boost::enable_shared_from_this<VideoContent>
{
public:
class VideoContent : public ContentPart, public boost::enable_shared_from_this<VideoContent>
{
public:
- VideoContent (Content* parent);
+
explicit
VideoContent (Content* parent);
VideoContent (Content* parent, std::vector<boost::shared_ptr<Content> >);
void as_xml (xmlpp::Node *) const;
VideoContent (Content* parent, std::vector<boost::shared_ptr<Content> >);
void as_xml (xmlpp::Node *) const;