ci

kasper93 · Jan 2, 2024 · 880283e · 880283e
1 parent 28b21e4
commit 880283e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -217,7 +217,7 @@ jobs:
                 vulkan-headers \
                 wayland-protocols
             ./ci/build-freebsd.sh
-            meson test -C build
+            meson test -v -C build
 
   msys2:
     runs-on: windows-latest

diff --git a/ci/build-freebsd.sh b/ci/build-freebsd.sh
@@ -10,6 +10,7 @@ export LDFLAGS="$LDFLAGS -L/usr/local/lib"
 meson setup build \
     --werror      \
     -Dc_args="-Wno-error=deprecated -Wno-error=deprecated-declarations" \
+    -Db_sanitize=address \
     -Diconv=disabled \
     -Dlibmpv=true \
     -Dlua=enabled \

diff --git a/sub/ass_mp.c b/sub/ass_mp.c
@@ -40,6 +40,8 @@
 #include "video/out/bitmap_packer.h"
 #include "video/mp_image.h"
 
+#include <stdio.h>
+
 // res_y should be track->PlayResY
 // It determines scaling of font sizes and more.
 void mp_ass_set_style(ASS_Style *style, double res_y,
@@ -63,6 +65,7 @@ void mp_ass_set_style(ASS_Style *style, double res_y,
     style->PrimaryColour = MP_ASS_COLOR(opts->color);
     style->SecondaryColour = style->PrimaryColour;
     style->OutlineColour = MP_ASS_COLOR(opts->border_color);
+
     if (opts->back_color.a) {
         style->BackColour = MP_ASS_COLOR(opts->back_color);
         style->BorderStyle = 4; // opaque box
@@ -74,7 +77,7 @@ void mp_ass_set_style(ASS_Style *style, double res_y,
     style->Shadow = opts->shadow_offset * scale;
     style->Spacing = opts->spacing * scale;
     style->MarginL = opts->margin_x * scale;
-    style->MarginR = style->MarginL;
+    style->MarginR = opts->margin_x * scale;
     style->MarginV = opts->margin_y * scale;
     style->ScaleX = 1.;
     style->ScaleY = 1.;