diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | libs/gst/check/libcheck/check.h.in | 2 | ||||
| -rwxr-xr-x | scripts/gst-uninstalled | 6 | ||||
| -rw-r--r-- | tests/benchmarks/gstclockstress.c | 5 | ||||
| -rw-r--r-- | tools/gst-inspect.c | 1 |
5 files changed, 16 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 576e9c8a2e..18e1fdda08 100644 --- a/configure.ac +++ b/configure.ac @@ -74,6 +74,8 @@ AG_GST_GETTEXT([gstreamer-$GST_MAJORMINOR]) dnl *** check for arguments to configure *** +AG_GST_ARG_DISABLE_FATAL_WARNINGS + dnl subsystems - can influence other decisions so needs to be high up dnl we need to AM_CONDITIONAL them here for automake 1.6.x compatibility AG_GST_CHECK_SUBSYSTEM_DISABLE(GST_DEBUG,[debugging subsystem]) @@ -599,7 +601,7 @@ if test "x${GST_DISABLE_GST_DEBUG}" = "xyes"; then fi dnl define an ERROR_CFLAGS Makefile variable -AG_GST_SET_ERROR_CFLAGS($GST_GIT, [-Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wformat-nonliteral -Wformat-security -Wold-style-definition -Winit-self -Wmissing-include-dirs -Waddress -Waggregate-return -Wno-multichar -Wnested-externs $NO_WARNINGS]) +AG_GST_SET_ERROR_CFLAGS($FATAL_WARNINGS, [-Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wformat-nonliteral -Wformat-security -Wold-style-definition -Winit-self -Wmissing-include-dirs -Waddress -Waggregate-return -Wno-multichar -Wnested-externs $NO_WARNINGS]) dnl define correct level for debugging messages AG_GST_SET_LEVEL_DEFAULT($GST_GIT) diff --git a/libs/gst/check/libcheck/check.h.in b/libs/gst/check/libcheck/check.h.in index 231fdbb568..3ed1acd75d 100644 --- a/libs/gst/check/libcheck/check.h.in +++ b/libs/gst/check/libcheck/check.h.in @@ -232,7 +232,7 @@ static void __testname (int _i CK_ATTRIBUTE_UNUSED)\ "Failure '"#expr"' occured" , ## __VA_ARGS__, NULL) /* Always fail */ -#define fail(...) _fail_unless(0, __FILE__, __LINE__, "Failed" , ## __VA_ARGS__, NULL) +#define fail(...) _fail_unless(0, __FILE__, __LINE__, "Failed" __VA_ARGS__, NULL) /* Non macro version of #fail_unless, with more complicated interface */ void CK_EXPORT _fail_unless (int result, const char *file, diff --git a/scripts/gst-uninstalled b/scripts/gst-uninstalled index fa51658b7c..6cc1b37169 100755 --- a/scripts/gst-uninstalled +++ b/scripts/gst-uninstalled @@ -59,10 +59,12 @@ $PATH" # /some/path: makes the dynamic linker look in . too, so avoid this LD_LIBRARY_PATH=$GST_PREFIX/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} DYLD_LIBRARY_PATH=$GST_PREFIX/lib${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH} +GI_TYPELIB_PATH=$GST_PREFIX/share/gir-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH} # GStreamer rtsp server library LD_LIBRARY_PATH=$GST/gst-rtsp-server/gst/rtsp-server/.libs:$LD_LIBRARY_PATH DYLD_LIBRARY_PATH=$GST/gst-rtsp-server/gst/rtsp-server/.libs:$DYLD_LIBRARY_PATH +GI_TYPELIB_PATH=$GST/gst-rtsp-server/gst/rtsp-server:$GI_TYPELIB_PATH # GStreamer ffmpeg libraries for path in libavformat libavutil libavcodec libpostproc libavdevice @@ -76,6 +78,7 @@ for path in app audio cdda fft interfaces pbutils netbuffer riff rtp rtsp sdp ta do LD_LIBRARY_PATH=$GST/gst-plugins-base/gst-libs/gst/$path/.libs:$LD_LIBRARY_PATH DYLD_LIBRARY_PATH=$GST/gst-plugins-base/gst-libs/gst/$path/.libs:$DYLD_LIBRARY_PATH + GI_TYPELIB_PATH=$GST/gst-plugins-base/gst-libs/gst/$path:$GI_TYPELIB_PATH done # GStreamer core libraries @@ -83,11 +86,14 @@ for path in base net check controller do LD_LIBRARY_PATH=$GST/gstreamer/libs/gst/$path/.libs:$LD_LIBRARY_PATH DYLD_LIBRARY_PATH=$GST/gstreamer/libs/gst/$path/.libs:$DYLD_LIBRARY_PATH + GI_TYPELIB_PATH=$GST/gstreamer/libs/gst/$path:$GI_TYPELIB_PATH done LD_LIBRARY_PATH=$GST/gstreamer/gst/.libs:$LD_LIBRARY_PATH DYLD_LIBRARY_PATH=$GST/gstreamer/gst/.libs:$DYLD_LIBRARY_PATH +GI_TYPELIB_PATH=$GST/gstreamer/gst:$GI_TYPELIB_PATH export LD_LIBRARY_PATH export DYLD_LIBRARY_PATH +export GI_TYPELIB_PATH export PKG_CONFIG_PATH="\ $GST_PREFIX/lib/pkgconfig\ diff --git a/tests/benchmarks/gstclockstress.c b/tests/benchmarks/gstclockstress.c index 6abd7d9959..47aa5cc431 100644 --- a/tests/benchmarks/gstclockstress.c +++ b/tests/benchmarks/gstclockstress.c @@ -60,6 +60,11 @@ main (gint argc, gchar * argv[]) num_threads = atoi (argv[1]); + if (num_threads <= 0 || num_threads > MAX_THREADS) { + g_print ("number of threads must be between 0 and %d\n", MAX_THREADS); + exit (-2); + } + sysclock = gst_system_clock_obtain (); for (t = 0; t < num_threads; t++) { diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c index 3a8adf5968..82042d1cb7 100644 --- a/tools/gst-inspect.c +++ b/tools/gst-inspect.c @@ -1302,6 +1302,7 @@ print_element_info (GstElementFactory * factory, gboolean print_names) element = gst_element_factory_create (factory, NULL); if (!element) { + gst_object_unref (factory); g_print ("couldn't construct element for some reason\n"); return -1; } |