Revert "Remove join function; the code is long and I don't think anybody"

It turns out Carsten uses it :)

This reverts commit bd5e8b83a3a18787241982efdae809d4db21f65d.

1 files changed, 1 insertions, 0 deletions

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 21f5d4680..64f6f9ff8 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -48,6 +48,7 @@ class FFmpegContent : public Content
 public:
 	FFmpegContent (boost::shared_ptr<const Film>, boost::filesystem::path);
 	FFmpegContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int version, std::list<std::string> &);
+	FFmpegContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
 
 	boost::shared_ptr<FFmpegContent> shared_from_this () {
 		return boost::dynamic_pointer_cast<FFmpegContent> (Content::shared_from_this ());