Merge master; MXF subtitle stuff not included.

1 files changed, 1 insertions, 4 deletions

diff --git a/src/mxf.h b/src/mxf.h
index 525ac701..48a1f64e 100644
--- a/src/mxf.h
+++ b/src/mxf.h
@@ -102,10 +102,7 @@ public:
 	}
 
 protected:
-	std::string pkl_type () const {
-		return "application/x-smpte-mxf";
-	}
-	
+	std::string pkl_type (Standard standard) const;
 	void read_writer_info (ASDCP::WriterInfo const &);
 	
 	ASDCP::AESEncContext* _encryption_context;