diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-05-27 10:21:46 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-05-27 10:21:46 +0100 |
| commit | 0a20f4b0ee59f06732648f981fe4d3e387b5705a (patch) | |
| tree | 896bcb730b4985186597d854cadd18fa712d4ea6 /src/lib | |
| parent | 387304bc9147933b68eda2b38ba8cac0d250e87e (diff) | |
Fix some uninitialised variables.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/audio_content.h | 2 | ||||
| -rw-r--r-- | src/lib/content_video.h | 1 | ||||
| -rw-r--r-- | src/lib/ffmpeg_examiner.cc | 1 | ||||
| -rw-r--r-- | src/lib/video_content.cc | 8 |
4 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h index cb14c70cb..ee5a7db7a 100644 --- a/src/lib/audio_content.h +++ b/src/lib/audio_content.h @@ -54,8 +54,6 @@ public: class AudioContent : public virtual Content { public: - typedef int64_t Frame; - AudioContent (boost::shared_ptr<const Film>); AudioContent (boost::shared_ptr<const Film>, DCPTime); AudioContent (boost::shared_ptr<const Film>, boost::filesystem::path); diff --git a/src/lib/content_video.h b/src/lib/content_video.h index cdf0f9cdd..c8f5cca0b 100644 --- a/src/lib/content_video.h +++ b/src/lib/content_video.h @@ -31,6 +31,7 @@ public: ContentVideo () : eyes (EYES_BOTH) , part (PART_WHOLE) + , frame (0) {} ContentVideo (boost::shared_ptr<const ImageProxy> i, Eyes e, Part p, Frame f) diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc index eea99e1e8..5062ef0ca 100644 --- a/src/lib/ffmpeg_examiner.cc +++ b/src/lib/ffmpeg_examiner.cc @@ -40,6 +40,7 @@ using boost::optional; /** @param job job that the examiner is operating in, or 0 */ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Job> job) : FFmpeg (c) + , _video_length (0) , _need_video_length (false) { /* Find audio and subtitle streams */ 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; } } |