Merge remote-tracking branch 'origin/main' into v1.9.x

[libdcp.git] / src / combine.h

diff --git a/src/combine.h b/src/combine.h
index 21acbb04816d1a0d0af8d9c4cc6d83a7eee88750..b23b21beaf61f8aa8250efe071c02475c32b7e10 100644 (file)
--- a/src/combine.h
+++ b/src/combine.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -32,6 +32,11 @@
 */
 
 
+/** @file  src/combine.h
+ *  @brief Method to combine DCPs
+ */
+
+
 #include "compose.hpp"
 #include "version.h"
 #include <boost/filesystem.hpp>
@@ -39,8 +44,10 @@
 
 namespace dcp {
 
+
 class CertificateChain;
 
+
 void combine (
        std::vector<boost::filesystem::path> inputs,
        boost::filesystem::path output,
@@ -51,5 +58,6 @@ void combine (
        std::shared_ptr<const CertificateChain> signer = std::shared_ptr<CertificateChain>()
        );
 
+
 }