Skip to content

Commit 650cfec

Browse files
committed
NDI v5 compat
honor the USE_NDI_VERSION + notice how to set this to configure.ac
1 parent 87789be commit 650cfec

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

configure.ac

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3255,7 +3255,8 @@ ENSURE_FEATURE_PRESENT([$cmpto_j2k_req], [$cmpto_j2k], [Comprimato J2K not found
32553255
# ------------------------------------------------------------------------------
32563256
ndi=no
32573257
AC_ARG_ENABLE(ndi,
3258-
AS_HELP_STRING([--enable-ndi@<:@=ver@:>@], [enables NDI support (default is auto)]),
3258+
AS_HELP_STRING([--enable-ndi@<:@=ver@:>@], [enables NDI support (default is auto).]
3259+
[Set ver to 5 if using NDI 5.]),
32593260
[ndi_req=$enableval],
32603261
[ndi_req=$build_default]
32613262
)

src/video_capture/ndi.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -623,9 +623,11 @@ static struct video_frame *vidcap_ndi_grab(void *state, struct audio_frame **aud
623623
case NDIlib_frame_type_status_change:
624624
LOG(LOG_LEVEL_NOTICE) << MOD_NAME << "Status changed!\n";
625625
break;
626+
#if USE_NDI_VERSION >= 6
626627
case NDIlib_frame_type_source_change:
627628
LOG(LOG_LEVEL_NOTICE) << MOD_NAME << "Source changed!\n";
628629
break;
630+
#endif
629631
case NDIlib_frame_type_max:
630632
assert(0 && "NDIlib_frame_type_max is invalid!");
631633
}

0 commit comments

Comments
 (0)