Skip to content

Commit

Permalink
ci
Browse files Browse the repository at this point in the history
  • Loading branch information
kasper93 committed Jan 2, 2024
1 parent 28b21e4 commit 95c508b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ci/build-freebsd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
12 changes: 6 additions & 6 deletions sub/ass_mp.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ void mp_ass_set_style(ASS_Style *style, double res_y,
if (!style)
return;

if (opts->font) {
if (!style->FontName || strcmp(style->FontName, opts->font) != 0) {
free(style->FontName);
style->FontName = strdup(opts->font);
}
}
// if (opts->font) {
// if (!style->FontName || strcmp(style->FontName, opts->font) != 0) {
// free(style->FontName);
// style->FontName = strdup(opts->font);
// }
// }

// libass_font_size = FontSize * (window_height / res_y)
// scale translates parameters from PlayResY=720 to res_y
Expand Down

0 comments on commit 95c508b

Please sign in to comment.