From: <tp...@ke...> - 2006-11-16 14:35:45
|
CVS Root: /cvs/gstreamer Module: gst-plugins-base Changes by: tpm Date: Thu Nov 16 2006 14:35:42 UTC Log message: * gst/videotestsrc/Makefile.am: * tests/check/Makefile.am: Make sure our checks and the videotestsrc plugin link against the local uninstalled gst libs and not any installed gst libs that might happen to exist as well. * tests/check/elements/adder.c: (message_received), (test_event_message_received), (test_play_twice_message_received): * tests/check/elements/ffmpegcolorspace.c: (GST_START_TEST): Fix compiler warnings when compiling against core with disabled debugging system. Modified files: . : ChangeLog gst/videotestsrc: Makefile.am tests/check : Makefile.am tests/check/elements: adder.c ffmpegcolorspace.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.3016&r2=1.3017 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst/videotestsrc/Makefile.am.diff?r1=1.9&r2=1.10 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/tests/check/Makefile.am.diff?r1=1.56&r2=1.57 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/tests/check/elements/adder.c.diff?r1=1.11&r2=1.12 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/tests/check/elements/ffmpegcolorspace.c.diff?r1=1.1&r2=1.2 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v retrieving revision 1.3016 retrieving revision 1.3017 diff -u -d -r1.3016 -r1.3017 --- ChangeLog 16 Nov 2006 12:55:08 -0000 1.3016 +++ ChangeLog 16 Nov 2006 14:35:29 -0000 1.3017 @@ -1,3 +1,17 @@ +2006-11-16 Tim-Philipp Müller <tim at centricular dot net> + + * gst/videotestsrc/Makefile.am: + * tests/check/Makefile.am: + Make sure our checks and the videotestsrc plugin link against the + local uninstalled gst libs and not any installed gst libs that + might happen to exist as well. + * tests/check/elements/adder.c: (message_received), + (test_event_message_received), (test_play_twice_message_received): + * tests/check/elements/ffmpegcolorspace.c: (GST_START_TEST): + Fix compiler warnings when compiling against core with disabled + debugging system. 2006-11-16 Michael Smith <ms...@fl...> * gst/audiorate/gstaudiorate.c: (gst_audio_rate_reset), Index: Makefile.am RCS file: /cvs/gstreamer/gst-plugins-base/gst/videotestsrc/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Makefile.am 14 Jul 2005 18:42:47 -0000 1.9 +++ Makefile.am 16 Nov 2006 14:35:30 -0000 1.10 @@ -6,6 +6,6 @@ libgstvideotestsrc_la_CFLAGS = $(GST_CFLAGS) $(LIBOIL_CFLAGS) libgstvideotestsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -libgstvideotestsrc_la_LIBADD = $(GST_LIBS) $(LIBOIL_LIBS) $(GST_BASE_LIBS) +libgstvideotestsrc_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(LIBOIL_LIBS) noinst_HEADERS = gstvideotestsrc.h videotestsrc.h RCS file: /cvs/gstreamer/gst-plugins-base/tests/check/Makefile.am,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- Makefile.am 16 Nov 2006 12:55:08 -0000 1.56 +++ Makefile.am 16 Nov 2006 14:35:30 -0000 1.57 @@ -92,13 +92,24 @@ SUPPRESSIONS = $(top_srcdir)/common/gst.supp $(srcdir)/gst-plugins-base.supp +libs_audio_CFLAGS = \ + $(GST_BASE_CFLAGS) \ + $(AM_CFLAGS) libs_audio_LDADD = \ $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ + $(GST_BASE_LIBS) \ $(LDADD) +libs_cddabasesrc_CFLAGS = \ libs_cddabasesrc_LDADD = \ $(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la \ $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \ libs_tag_LDADD = \ @@ -108,8 +119,14 @@ $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ +elements_audioconvert_CFLAGS = \ elements_audioconvert_LDADD = \ elements_audiorate_LDADD = $(LDADD) @@ -140,15 +157,26 @@ $(VORBIS_CFLAGS) \ $(CFLAGS) $(AM_CFLAGS) +libs_video_CFLAGS = \ libs_video_LDADD = \ $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \ pipelines_oggmux_LDADD = $(LDADD) $(OGG_LIBS) pipelines_oggmux_CFLAGS = $(AM_CFLAGS) $(OGG_CFLAGS) +pipelines_simple_launch_lines_CFLAGS = \ pipelines_simple_launch_lines_LDADD = \ EXTRA_DIST = gst-plugins-base.supp Index: adder.c RCS file: /cvs/gstreamer/gst-plugins-base/tests/check/elements/adder.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- adder.c 28 Sep 2006 11:34:05 -0000 1.11 +++ adder.c 16 Nov 2006 14:35:30 -0000 1.12 @@ -37,11 +37,8 @@ static void message_received (GstBus * bus, GstMessage * message, GstPipeline * bin) { - GstObject *object = GST_MESSAGE_SRC (message); - - GST_INFO ("bus message from \"%s\" (%s): ", - GST_STR_NULL (GST_ELEMENT_NAME (object)), - gst_message_type_get_name (GST_MESSAGE_TYPE (message))); + GST_INFO ("bus message from \"%" GST_PTR_FORMAT "\": %" GST_PTR_FORMAT, + GST_MESSAGE_SRC (message), message); switch (message->type) { case GST_MESSAGE_EOS: @@ -71,11 +68,8 @@ test_event_message_received (GstBus * bus, GstMessage * message, GstPipeline * bin) case GST_MESSAGE_SEGMENT_DONE: @@ -176,12 +170,10 @@ test_play_twice_message_received (GstBus * bus, GstMessage * message, gboolean res; Index: ffmpegcolorspace.c RCS file: /cvs/gstreamer/gst-plugins-base/tests/check/elements/ffmpegcolorspace.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ffmpegcolorspace.c 21 Sep 2006 09:27:47 -0000 1.1 +++ ffmpegcolorspace.c 16 Nov 2006 14:35:30 -0000 1.2 @@ -300,8 +300,6 @@ for (l = conversions; l != NULL; l = l->next) { RGBConversion *conv = (RGBConversion *) l->data; - RGBFormat *from = &conv->from_fmt; - RGBFormat *to = &conv->to_fmt; /* does videotestsrc support the from_caps? */ if (!gst_caps_is_subset (conv->from_caps, template_caps)) { @@ -313,6 +311,12 @@ /* caps are supported, let's run some tests then ... */ for (p = 0; p < G_N_ELEMENTS (test_patterns); ++p) { GstStateChangeReturn state_ret; + RGBFormat *from = &conv->from_fmt; + RGBFormat *to = &conv->to_fmt; + /* trick compiler into thinking from is used, might throw warning + * otherwise if the debugging system is disabled */ + fail_unless (from != NULL); gst_element_set_state (pipeline, GST_STATE_NULL); |