X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=0646a478772a086704cfcb6b7e4d2d87408ab18c;hb=38e89b25f6042d7a9dc023bbdeff98b09cbdd26f;hp=6286d1a658dd9fde4bb1320bbd140586f49b05b4;hpb=f3e52bd763513190de60e7f6b68c50b34ab80fee;p=dcpomatic.git

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 6286d1a65..0646a4787 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -22,6 +22,8 @@
  *  @brief Some utility functions and classes.
  */
 
+#define UNICODE 1
+
 #include "util.h"
 #include "exceptions.h"
 #include "dcp_content_type.h"
@@ -367,10 +369,12 @@ dcpomatic_setup ()
 	SetUnhandledExceptionFilter(exception_handler);
 #endif
 
+#ifdef DCPOMATIC_HAVE_AVREGISTER
 DCPOMATIC_DISABLE_WARNINGS
 	av_register_all ();
 	avfilter_register_all ();
 DCPOMATIC_ENABLE_WARNINGS
+#endif
 
 #ifdef DCPOMATIC_OSX
 	/* Add our library directory to the libltdl search path so that
@@ -597,7 +601,7 @@ short_audio_channel_name (int c)
 		_("BsR"),
 		_("DBP"),
 		_("DBS"),
-		"",
+		_("Sign"),
 		""
 	};
 
@@ -951,7 +955,7 @@ void
 emit_subtitle_image (ContentTimePeriod period, dcp::SubtitleImage sub, dcp::Size size, shared_ptr<TextDecoder> decoder)
 {
 	/* XXX: this is rather inefficient; decoding the image just to get its size */
-	FFmpegImageProxy proxy (sub.png_image(), VideoRange::FULL);
+	FFmpegImageProxy proxy (sub.png_image());
 	auto image = proxy.image().image;
 	/* set up rect with height and width */
 	dcpomatic::Rect<double> rect(0, 0, image->size().width / double(size.width), image->size().height / double(size.height));