summaryrefslogtreecommitdiff
path: root/tests/rtp
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.co.uk>2008-08-21 18:34:29 -0400
committerOlivier CrĂȘte <olivier.crete@collabora.co.uk>2008-08-21 18:51:11 -0400
commit76c2efa3f28836f4ae0bbe7c22a5465d49861a59 (patch)
treea532db57b0506a6f5fc7c82464c50aaa348fbf18 /tests/rtp
parenta02d563db1c67b64f7e8d3072efd141e54ea0917 (diff)
downloadfarstream-76c2efa3f28836f4ae0bbe7c22a5465d49861a59.tar.gz
Remove fs_codec_to_gst_caps from the public api
Diffstat (limited to 'tests/rtp')
-rw-r--r--tests/rtp/Makefile.am10
-rw-r--r--tests/rtp/codec-discovery.c6
2 files changed, 10 insertions, 6 deletions
diff --git a/tests/rtp/Makefile.am b/tests/rtp/Makefile.am
index 92e5d3d1..54f383c8 100644
--- a/tests/rtp/Makefile.am
+++ b/tests/rtp/Makefile.am
@@ -8,7 +8,14 @@ codec_discovery_SOURCES = codec-discovery.c \
$(top_srcdir)/gst/fsrtpconference/fs-rtp-dtmf-event-source.c \
$(top_srcdir)/gst/fsrtpconference/fs-rtp-dtmf-sound-source.c \
$(top_srcdir)/gst/fsrtpconference/fs-rtp-codec-negotiation.c \
- $(top_srcdir)/gst/fsrtpconference/fs-rtp-specific-nego.c
+ $(top_srcdir)/gst/fsrtpconference/fs-rtp-specific-nego.c \
+ $(top_srcdir)/gst/fsrtpconference/fs-rtp-conference.c \
+ $(top_srcdir)/gst/fsrtpconference/fs-rtp-session.c \
+ $(top_srcdir)/gst/fsrtpconference/fs-rtp-stream.c \
+ $(top_srcdir)/gst/fsrtpconference/fs-rtp-substream.c \
+ $(top_srcdir)/gst/fsrtpconference/fs-rtp-participant.c \
+ $(top_srcdir)/gst/fsrtpconference/fs-rtp-marshal.c
+
codec_discovery_CFLAGS = \
-I$(top_srcdir)/gst/fsrtpconference/ \
$(FS2_INTERNAL_CFLAGS) \
@@ -19,4 +26,5 @@ codec_discovery_CFLAGS = \
LDADD = \
$(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
$(GST_CHECK_LIBS) \
+ -lgstrtp-@GST_MAJORMINOR@ \
$(GST_LIBS)
diff --git a/tests/rtp/codec-discovery.c b/tests/rtp/codec-discovery.c
index 39788b5c..3512604b 100644
--- a/tests/rtp/codec-discovery.c
+++ b/tests/rtp/codec-discovery.c
@@ -23,11 +23,7 @@
#include <gst/farsight/fs-codec.h>
#include "fs-rtp-discover-codecs.h"
-
-
-GST_DEBUG_CATEGORY (fsrtpconference_debug);
-GST_DEBUG_CATEGORY (fsrtpconference_disco);
-GST_DEBUG_CATEGORY (fsrtpconference_nego);
+#include "fs-rtp-conference.h"
static void