X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;fp=src%2Flib%2Fwriter.cc;h=125efd644e857933a2bf59d1157061eec405bde8;hp=33b7dd51ed00c04ed754ff7d7653cb5dead9639e;hb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;hpb=a4c19a34244aeaf183c25878933b570fc5c0ee34

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 33b7dd51e..125efd644 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -45,6 +45,9 @@
 
 #include "i18n.h"
 
+/* OS X strikes again */
+#undef set_key
+
 using std::make_pair;
 using std::pair;
 using std::string;
@@ -91,7 +94,7 @@ Writer::Writer (shared_ptr<const Film> f, weak_ptr<Job> j)
 		_picture_mxf.reset (new dcp::MonoPictureMXF (dcp::Fraction (_film->video_frame_rate (), 1)));
 	}
 
-	_picture_mxf->set_size (fit_ratio_within (_film->container()->ratio(), _film->full_frame ()));
+	_picture_mxf->set_size (_film->frame_size ());
 
 	if (_film->encrypted ()) {
 		_picture_mxf->set_key (_film->key ());