X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Frender_text.cc;h=96b832c577cb036f119dbfba4ffc675ede63f7f4;hb=3799e91d126d243d41c44dcb0ca1bfa66b53a57e;hp=e47098ee906916da55ce02ba71686a6c486726d0;hpb=37a6d1a768debea28c24174503d85903f7f90aa5;p=dcpomatic.git

diff --git a/src/lib/render_text.cc b/src/lib/render_text.cc
index e47098ee9..96b832c57 100644
--- a/src/lib/render_text.cc
+++ b/src/lib/render_text.cc
@@ -77,11 +77,7 @@ marked_up (list<StringText> subtitles, int target_height, float fade_factor)
 		/* Between 1-65535 inclusive, apparently... */
 		out += "alpha=\"" + dcp::raw_convert<string>(int(floor(fade_factor * 65534)) + 1) + "\" ";
 		out += "color=\"#" + i.colour().to_rgb_string() + "\">";
-
-		string t = i.text();
-		replace_all(t, "&", "&amp;");
-		out += t;
-
+		out += i.text();
 		out += "</span>";
 	}
 
@@ -100,7 +96,7 @@ static shared_ptr<Image>
 create_image (dcp::Size size)
 {
 	/* FFmpeg BGRA means first byte blue, second byte green, third byte red, fourth byte alpha */
-	auto image = make_shared<Image>(AV_PIX_FMT_BGRA, size, false);
+	auto image = make_shared<Image>(AV_PIX_FMT_BGRA, size, Image::Alignment::COMPACT);
 	image->make_black ();
 	return image;
 }