From: Carl Hetherington <cth@carlh.net>
Date: Thu, 4 Feb 2016 00:52:26 +0000 (+0000)
Subject: Fix some uninitialised stuff in the 'join' constructor of FFmpegContent.
X-Git-Tag: v2.6.19~8^2~1
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=6e2ff54bbdf78754baa7ed4390006469d96c0e79

Fix some uninitialised stuff in the 'join' constructor of FFmpegContent.
---

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index ba799be72..b47116bdc 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -131,10 +131,18 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> film, vector<boost::shared_
 		}
 	}
 
+	/* XXX: should probably check that more of the stuff below is the same in *this and ref */
+
 	_subtitle_streams = ref->subtitle_streams ();
 	_subtitle_stream = ref->subtitle_stream ();
 	_audio_streams = ref->ffmpeg_audio_streams ();
 	_first_video = ref->_first_video;
+	_filters = ref->_filters;
+	_color_range = ref->_color_range;
+	_color_primaries = ref->_color_primaries;
+	_color_trc = ref->_color_trc;
+	_colorspace = ref->_colorspace;
+	_bits_per_pixel = ref->_bits_per_pixel;
 }
 
 void