Merge master; MXF subtitle stuff not included.

1 files changed, 1 insertions, 3 deletions

diff --git a/src/cpl.h b/src/cpl.h
index 6ef992fd..8458a028 100644
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -111,9 +111,7 @@ public:
 
 protected:
 	/** @return type string for PKLs for this asset */
-	std::string pkl_type () const {
-		return "text/xml";
-	}
+	std::string pkl_type (Standard standard) const;
 
 private:
 	std::string _annotation_text;               ///< &lt;AnnotationText&gt;