summaryrefslogtreecommitdiff
path: root/src/lib/video_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-05-27 10:21:46 +0100
committerCarl Hetherington <cth@carlh.net>2015-05-27 10:21:46 +0100
commit0a20f4b0ee59f06732648f981fe4d3e387b5705a (patch)
tree896bcb730b4985186597d854cadd18fa712d4ea6 /src/lib/video_content.cc
parent387304bc9147933b68eda2b38ba8cac0d250e87e (diff)
Fix some uninitialised variables.
Diffstat (limited to 'src/lib/video_content.cc')
-rw-r--r--src/lib/video_content.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 0397647ef..a8355ffd6 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -66,6 +66,8 @@ VideoContent::VideoContent (shared_ptr<const Film> f)
, _video_frame_rate (0)
, _video_frame_type (VIDEO_FRAME_TYPE_2D)
, _scale (VideoContentScale (Ratio::from_id ("178")))
+ , _fade_in (0)
+ , _fade_out (0)
{
set_default_colour_conversion ();
}
@@ -76,6 +78,8 @@ VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, Frame len)
, _video_frame_rate (0)
, _video_frame_type (VIDEO_FRAME_TYPE_2D)
, _scale (VideoContentScale (Ratio::from_id ("178")))
+ , _fade_in (0)
+ , _fade_out (0)
{
set_default_colour_conversion ();
}
@@ -86,6 +90,8 @@ VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
, _video_frame_rate (0)
, _video_frame_type (VIDEO_FRAME_TYPE_2D)
, _scale (VideoContentScale (Ratio::from_id ("178")))
+ , _fade_in (0)
+ , _fade_out (0)
{
set_default_colour_conversion ();
}
@@ -120,6 +126,8 @@ VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, i
if (version >= 32) {
_fade_in = node->number_child<Frame> ("FadeIn");
_fade_out = node->number_child<Frame> ("FadeOut");
+ } else {
+ _fade_in = _fade_out = 0;
}
}