summaryrefslogtreecommitdiff
path: root/libavdevice
diff options
context:
space:
mode:
authorAnton Platov <anton@platov.net>2018-10-29 15:57:31 +0300
committerMarton Balint <cus@passwd.hu>2018-11-01 18:46:05 +0100
commit295fd12d17f339bdde0940d1f1885cf6db67e5d5 (patch)
tree0e13400c200a28efaf0e14128813588c1668f0ff /libavdevice
parentcb74c33106d08b09ff0a2e395fe0b69828031d63 (diff)
avdevice/libndi_newtek_dec: add extra_ips option to libndi_newtek allowing use remote network sources
Signed-off-by: Anton Platov <anton@platov.net> Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavdevice')
-rw-r--r--libavdevice/libndi_newtek_dec.c4
-rw-r--r--libavdevice/version.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/libavdevice/libndi_newtek_dec.c b/libavdevice/libndi_newtek_dec.c
index 4fb719770e..d2d5648c4b 100644
--- a/libavdevice/libndi_newtek_dec.c
+++ b/libavdevice/libndi_newtek_dec.c
@@ -33,6 +33,7 @@ struct NDIContext {
int find_sources;
int64_t wait_sources;
int allow_video_fields;
+ char *extra_ips;
/* Runtime */
NDIlib_recv_create_t *recv;
@@ -99,7 +100,7 @@ static int ndi_find_sources(AVFormatContext *avctx, const char *name, NDIlib_sou
struct NDIContext *ctx = avctx->priv_data;
const NDIlib_source_t *ndi_srcs = NULL;
const NDIlib_find_create_t find_create_desc = { .show_local_sources = true,
- .p_groups = NULL, .p_extra_ips = NULL };
+ .p_groups = NULL, .p_extra_ips = ctx->extra_ips };
if (!ctx->ndi_find)
ctx->ndi_find = NDIlib_find_create2(&find_create_desc);
@@ -317,6 +318,7 @@ static const AVOption options[] = {
{ "find_sources", "Find available sources" , OFFSET(find_sources), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, DEC },
{ "wait_sources", "Time to wait until the number of online sources have changed" , OFFSET(wait_sources), AV_OPT_TYPE_DURATION, { .i64 = 1000000 }, 100000, 20000000, DEC },
{ "allow_video_fields", "When this flag is FALSE, all video that you receive will be progressive" , OFFSET(allow_video_fields), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, DEC },
+ { "extra_ips", "List of comma separated ip addresses to scan for remote sources", OFFSET(extra_ips), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC },
{ NULL },
};
diff --git a/libavdevice/version.h b/libavdevice/version.h
index c35c98aedb..0fe2e6c3e1 100644
--- a/libavdevice/version.h
+++ b/libavdevice/version.h
@@ -29,7 +29,7 @@
#define LIBAVDEVICE_VERSION_MAJOR 58
#define LIBAVDEVICE_VERSION_MINOR 4
-#define LIBAVDEVICE_VERSION_MICRO 106
+#define LIBAVDEVICE_VERSION_MICRO 107
#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
LIBAVDEVICE_VERSION_MINOR, \