summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-02-04 00:52:26 +0000
committerCarl Hetherington <cth@carlh.net>2016-02-04 00:52:26 +0000
commit6e2ff54bbdf78754baa7ed4390006469d96c0e79 (patch)
tree20408ac9e638dbd4bdd4c0950baf5335054d9ab6 /src
parentbe0218ee500271701de419bfbd1b82fcfa5c4fa6 (diff)
Fix some uninitialised stuff in the 'join' constructor of FFmpegContent.
Diffstat (limited to 'src')
-rw-r--r--src/lib/ffmpeg_content.cc8
1 files changed, 8 insertions, 0 deletions
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