mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-07-01 20:30:41 +00:00
gst/: Fix build flags order.
Original commit message from CVS: * gst/interleave/Makefile.am: * gst/matroska/Makefile.am: Fix build flags order. * tests/check/elements/audioamplify.c: (GST_START_TEST): * tests/check/elements/audiodynamic.c: (GST_START_TEST): * tests/check/elements/audioinvert.c: (GST_START_TEST): * tests/check/elements/audiopanorama.c: (GST_START_TEST): Format fixes. * tests/check/elements/multifile.c: Pull in unistd.h
This commit is contained in:
Jan Schmidt
parent
1c6a371d0c
commit
a236a2df36
15
ChangeLog
15
ChangeLog
|
|
@ -1,3 +1,18 @@
|
|||
2008-09-17 Jan Schmidt <jan.schmidt@sun.com>
|
||||
|
||||
* gst/interleave/Makefile.am:
|
||||
* gst/matroska/Makefile.am:
|
||||
Fix build flags order.
|
||||
|
||||
* tests/check/elements/audioamplify.c: (GST_START_TEST):
|
||||
* tests/check/elements/audiodynamic.c: (GST_START_TEST):
|
||||
* tests/check/elements/audioinvert.c: (GST_START_TEST):
|
||||
* tests/check/elements/audiopanorama.c: (GST_START_TEST):
|
||||
Format fixes.
|
||||
|
||||
* tests/check/elements/multifile.c:
|
||||
Pull in unistd.h
|
||||
|
||||
2008-09-15 Wim Taymans <wim.taymans@collabora.co.uk>
|
||||
|
||||
* gst/rtp/gstrtpmp4gdepay.c: (gst_rtp_mp4g_depay_init),
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstinterleave.la
|
|||
|
||||
libgstinterleave_la_SOURCES = plugin.c interleave.c deinterleave.c
|
||||
libgstinterleave_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
|
||||
libgstinterleave_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR)
|
||||
libgstinterleave_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_LIBS) $(GST_BASE_LIBS)
|
||||
libgstinterleave_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||
|
||||
noinst_HEADERS = plugin.h interleave.h deinterleave.h
|
||||
|
|
|
|||
|
|
@ -19,16 +19,16 @@ noinst_HEADERS = \
|
|||
lzo.h
|
||||
|
||||
libgstmatroska_la_CFLAGS = \
|
||||
$(GST_BASE_CFLAGS) \
|
||||
$(GST_PLUGINS_BASE_CFLAGS) \
|
||||
$(GST_BASE_CFLAGS) \
|
||||
$(GST_CFLAGS) \
|
||||
-I$(top_srcdir)/gst-libs
|
||||
libgstmatroska_la_LIBADD = \
|
||||
$(GST_BASE_LIBS) \
|
||||
$(GST_PLUGINS_BASE_LIBS) \
|
||||
$(GST_LIBS) \
|
||||
-lgstriff-@GST_MAJORMINOR@ \
|
||||
-lgsttag-@GST_MAJORMINOR@ \
|
||||
$(GST_BASE_LIBS) \
|
||||
$(GST_LIBS) \
|
||||
$(ZLIB_LIBS) \
|
||||
$(BZ2_LIBS) \
|
||||
$(LIBM)
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ GST_START_TEST (test_passthrough)
|
|||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO
|
||||
("expected %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld",
|
||||
("expected %+5d %+5d %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d %+5d %+5d",
|
||||
in[0], in[1], in[2], in[3], in[4], in[5], res[0], res[1], res[2], res[3],
|
||||
res[4], res[5]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), in, 12) == 0);
|
||||
|
|
@ -166,7 +166,7 @@ GST_START_TEST (test_zero)
|
|||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO
|
||||
("expected %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld",
|
||||
("expected %+5d %+5d %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d %+5d %+5d",
|
||||
out[0], out[1], out[2], out[3], out[4], out[5], res[0], res[1], res[2],
|
||||
res[3], res[4], res[5]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 12) == 0);
|
||||
|
|
@ -208,7 +208,7 @@ GST_START_TEST (test_050_clip)
|
|||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO
|
||||
("expected %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld",
|
||||
("expected %+5d %+5d %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d %+5d %+5d",
|
||||
out[0], out[1], out[2], out[3], out[4], out[5], res[0], res[1], res[2],
|
||||
res[3], res[4], res[5]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 12) == 0);
|
||||
|
|
@ -250,7 +250,7 @@ GST_START_TEST (test_200_clip)
|
|||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO
|
||||
("expected %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld",
|
||||
("expected %+5d %+5d %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d %+5d %+5d",
|
||||
out[0], out[1], out[2], out[3], out[4], out[5], res[0], res[1], res[2],
|
||||
res[3], res[4], res[5]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 12) == 0);
|
||||
|
|
@ -293,7 +293,7 @@ GST_START_TEST (test_050_wrap_negative)
|
|||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO
|
||||
("expected %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld",
|
||||
("expected %+5d %+5d %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d %+5d %+5d",
|
||||
out[0], out[1], out[2], out[3], out[4], out[5], res[0], res[1], res[2],
|
||||
res[3], res[4], res[5]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 12) == 0);
|
||||
|
|
@ -336,7 +336,7 @@ GST_START_TEST (test_200_wrap_negative)
|
|||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO
|
||||
("expected %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld",
|
||||
("expected %+5d %+5d %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d %+5d %+5d",
|
||||
out[0], out[1], out[2], out[3], out[4], out[5], res[0], res[1], res[2],
|
||||
res[3], res[4], res[5]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 12) == 0);
|
||||
|
|
@ -379,7 +379,7 @@ GST_START_TEST (test_050_wrap_positive)
|
|||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO
|
||||
("expected %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld",
|
||||
("expected %+5d %+5d %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d %+5d %+5d",
|
||||
out[0], out[1], out[2], out[3], out[4], out[5], res[0], res[1], res[2],
|
||||
res[3], res[4], res[5]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 12) == 0);
|
||||
|
|
@ -422,7 +422,7 @@ GST_START_TEST (test_200_wrap_positive)
|
|||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO
|
||||
("expected %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld",
|
||||
("expected %+5d %+5d %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d %+5d %+5d",
|
||||
out[0], out[1], out[2], out[3], out[4], out[5], res[0], res[1], res[2],
|
||||
res[3], res[4], res[5]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 12) == 0);
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ GST_START_TEST (test_passthrough)
|
|||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO
|
||||
("expected %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld",
|
||||
("expected %+5d %+5d %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d %+5d %+5d",
|
||||
in[0], in[1], in[2], in[3], in[4], in[5], res[0], res[1], res[2], res[3],
|
||||
res[4], res[5]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), in, 12) == 0);
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ GST_START_TEST (test_passthrough)
|
|||
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
|
||||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
|
||||
GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
|
||||
in[0], in[1], in[2], in[3], res[0], res[1], res[2], res[3]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), in, 8) == 0);
|
||||
|
||||
|
|
@ -163,7 +163,7 @@ GST_START_TEST (test_zero)
|
|||
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
|
||||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
|
||||
GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
|
||||
out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
|
||||
|
||||
|
|
@ -203,7 +203,7 @@ GST_START_TEST (test_full_inverse)
|
|||
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
|
||||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
|
||||
GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
|
||||
out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
|
||||
|
||||
|
|
@ -243,7 +243,7 @@ GST_START_TEST (test_25_inverse)
|
|||
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
|
||||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
|
||||
GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
|
||||
out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
|
||||
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ GST_START_TEST (test_mono_middle)
|
|||
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
|
||||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
|
||||
GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
|
||||
out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
|
||||
|
||||
|
|
@ -203,7 +203,7 @@ GST_START_TEST (test_mono_left)
|
|||
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
|
||||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
|
||||
GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
|
||||
out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
|
||||
|
||||
|
|
@ -243,7 +243,7 @@ GST_START_TEST (test_mono_right)
|
|||
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
|
||||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
|
||||
GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
|
||||
out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
|
||||
|
||||
|
|
@ -282,7 +282,7 @@ GST_START_TEST (test_stereo_middle)
|
|||
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
|
||||
|
||||
res = (gint16 *) GST_BUFFER_DATA (inbuffer);
|
||||
GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
|
||||
GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
|
||||
in[0], in[1], in[2], in[3], res[0], res[1], res[2], res[3]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), in, 8) == 0);
|
||||
|
||||
|
|
@ -323,7 +323,7 @@ GST_START_TEST (test_stereo_left)
|
|||
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
|
||||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
|
||||
GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
|
||||
out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
|
||||
|
||||
|
|
@ -363,7 +363,7 @@ GST_START_TEST (test_stereo_right)
|
|||
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
|
||||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
|
||||
GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
|
||||
out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
|
||||
|
||||
|
|
@ -402,7 +402,7 @@ GST_START_TEST (test_mono_middle_simple)
|
|||
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
|
||||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
|
||||
GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
|
||||
out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
|
||||
|
||||
|
|
@ -443,7 +443,7 @@ GST_START_TEST (test_mono_left_simple)
|
|||
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
|
||||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
|
||||
GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
|
||||
out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
|
||||
|
||||
|
|
@ -484,7 +484,7 @@ GST_START_TEST (test_mono_right_simple)
|
|||
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
|
||||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
|
||||
GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
|
||||
out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
|
||||
|
||||
|
|
@ -524,7 +524,7 @@ GST_START_TEST (test_stereo_middle_simple)
|
|||
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
|
||||
|
||||
res = (gint16 *) GST_BUFFER_DATA (inbuffer);
|
||||
GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
|
||||
GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
|
||||
in[0], in[1], in[2], in[3], res[0], res[1], res[2], res[3]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), in, 8) == 0);
|
||||
|
||||
|
|
@ -566,7 +566,7 @@ GST_START_TEST (test_stereo_left_simple)
|
|||
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
|
||||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
|
||||
GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
|
||||
out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
|
||||
|
||||
|
|
@ -607,7 +607,7 @@ GST_START_TEST (test_stereo_right_simple)
|
|||
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
|
||||
|
||||
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
|
||||
GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
|
||||
GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
|
||||
out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
|
||||
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
|
||||
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@
|
|||
#endif
|
||||
|
||||
#include <glib/gstdio.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <gst/check/gstcheck.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
|
|
|||
Loading…
Reference in a new issue