Assorted tidying.

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

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 6286d1a658dd9fde4bb1320bbd140586f49b05b4..4ce677bf63a666b2fceacceb490eb297af7133ff 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -367,10 +367,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 +599,7 @@ short_audio_channel_name (int c)
                _("BsR"),
                _("DBP"),
                _("DBS"),
-               "",
+               _("Sign"),
                ""
        };
 
@@ -951,7 +953,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));