Various alignment adjustments.

[dcpomatic.git] / src / lib / util.cc

diff --git a/src/lib/util.cc b/src/lib/util.cc
index a3c8c50820d3c5bca94f13e0fb52935eb933167d..c65b2bc850fcac89c49195d55fcb901ab9216572 100644 (file)
--- 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"),
                ""
        };
 
@@ -952,7 +956,7 @@ emit_subtitle_image (ContentTimePeriod period, dcp::SubtitleImage sub, dcp::Size
 {
        /* XXX: this is rather inefficient; decoding the image just to get its size */
        FFmpegImageProxy proxy (sub.png_image());
-       auto image = proxy.image().image;
+       auto image = proxy.image(false).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));