Merge pull request #2 from funman/for_master

For master
funman · May 30, 2016 · e013432 · e013432
2 parents 67ea5ea + 18f9d4f
commit e013432
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/examples/uplay.c b/examples/uplay.c
@@ -369,7 +369,7 @@ static void uplay_start(struct upump *upump)
     struct uprobe *uprobe_src = uprobe_xfer_alloc(uprobe_use(uprobe_main));
     uprobe_xfer_add(uprobe_src, UPROBE_XFER_VOID, UPROBE_SOURCE_END, 0);
 
-    uprobe_dejitter_set(uprobe_dejitter, DEJITTER_DIVIDER);
+    uprobe_dejitter_set(uprobe_dejitter, true, 0);
     src_out_queue_length = SRC_OUT_QUEUE_LENGTH;
 
     /* try rtp source */

diff --git a/lib/upipe-blackmagic/Makefile.am b/lib/upipe-blackmagic/Makefile.am
@@ -3,21 +3,26 @@ lib_LTLIBRARIES = libupipe_blackmagic.la
 libupipe_blackmagic_la_SOURCES = ubuf_pic_blackmagic.cpp \
                                  ubuf_sound_blackmagic.cpp \
                                  upipe_blackmagic_source.cpp \
-                                 upipe_blackmagic_sink.cpp
+                                 upipe_blackmagic_sink.cpp \
+                                 include/DeckLinkAPIDispatch.cpp
 
 EXTRA_libupipe_blackmagic_la_SOURCES = include/DeckLinkAPIConfiguration.h \
                                        include/DeckLinkAPIDeckControl.h \
                                        include/DeckLinkAPIDiscovery.h \
-                                       include/DeckLinkAPIDispatch.cpp \
                                        include/DeckLinkAPI.h \
                                        include/DeckLinkAPIModes.h \
                                        include/DeckLinkAPITypes.h \
                                        include/DeckLinkAPIVersion.h \
                                        include/LinuxCOM.h
 
+
 libupipe_blackmagic_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
 libupipe_blackmagic_la_CXXFLAGS = -Wno-missing-declarations
 libupipe_blackmagic_la_LIBADD = $(top_builddir)/lib/upipe/libupipe.la -ldl
+if HAVE_ZVBI
+libupipe_blackmagic_la_CPPFLAGS += $(ZVBI_CFLAGS)
+libupipe_blackmagic_la_LIBADD += $(ZVBI_LIBS)
+endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libupipe_blackmagic.pc
diff --git a/lib/upipe-blackmagic/upipe_blackmagic_sink.cpp b/lib/upipe-blackmagic/upipe_blackmagic_sink.cpp
@@ -72,7 +72,6 @@
 #include <libzvbi.h>
 
 #include "include/DeckLinkAPI.h"
-#include "include/DeckLinkAPIDispatch.cpp"
 
 #define CC_LINE 9
 #define AFD_LINE 11

diff --git a/lib/upipe-blackmagic/upipe_blackmagic_source.cpp b/lib/upipe-blackmagic/upipe_blackmagic_source.cpp
@@ -67,7 +67,6 @@
 #include <pthread.h>
 
 #include "include/DeckLinkAPI.h"
-#include "include/DeckLinkAPIDispatch.cpp"
 
 /** uqueue length */
 #define MAX_QUEUE_LENGTH 255

diff --git a/lib/upipe-modules/Makefile.am b/lib/upipe-modules/Makefile.am
@@ -49,7 +49,6 @@ libupipe_modules_la_SOURCES = \
 	upipe_rtp_fec.c \
 	upipe_dump.c \
 	upipe_rtp_opus.c \
-	upipe_dump.c \
 	uprobe_http_redirect.c \
 	upipe_m3u_reader.c \
 	upipe_auto_source.c \

diff --git a/lib/upipe-zvbi/Makefile.am b/lib/upipe-zvbi/Makefile.am
@@ -4,8 +4,8 @@ endif
 
 libupipe_zvbi_la_SOURCES = upipe_zvbienc.c
 libupipe_zvbi_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-libupipe_zvbi_la_CFLAGS = -Wall $(zvbiCALE_CFLAGS)
-libupipe_zvbi_la_LIBADD = $(top_builddir)/lib/upipe/libupipe.la $(zvbiCALE_LIBS)
+libupipe_zvbi_la_CFLAGS = -Wall $(ZVBI_CFLAGS)
+libupipe_zvbi_la_LIBADD = $(top_builddir)/lib/upipe/libupipe.la $(ZVBI_LIBS)
 libupipe_zvbi_la_LDFLAGS = -no-undefined
 
 pkgconfigdir = $(libdir)/pkgconfig