ci

kasper93 · Jan 3, 2024 · 5bd9c52 · 5bd9c52
1 parent 28b21e4
commit 5bd9c52
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 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/player/video.c b/player/video.c
@@ -129,9 +129,9 @@ void uninit_video_out(struct MPContext *mpctx)
     uninit_video_chain(mpctx);
     if (mpctx->video_out) {
         vo_destroy(mpctx->video_out);
+        mpctx->video_out = NULL;
         mp_notify(mpctx, MPV_EVENT_VIDEO_RECONFIG, NULL);
     }
-    mpctx->video_out = NULL;
 }
 
 static void vo_chain_uninit(struct vo_chain *vo_c)

diff --git a/video/out/vo_null.c b/video/out/vo_null.c
@@ -73,12 +73,11 @@ static int preinit(struct vo *vo)
 
 static int control(struct vo *vo, uint32_t request, void *data)
 {
-    struct priv *p = vo->priv;
     switch (request) {
     case VOCTRL_GET_DISPLAY_FPS:
-        if (!p->cfg_fps)
+        if (!((struct priv*)vo->priv)->cfg_fps)
             break;
-        *(double *)data = p->cfg_fps;
+        *(double *)data = ((struct priv*)vo->priv)->cfg_fps;
         return VO_TRUE;
     }
     return VO_NOTIMPL;