diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-10 16:46:50 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-10 16:46:50 +0100 |
| commit | 1119f6ee4103990ccc55d521be08bdce10737c8e (patch) | |
| tree | d2b9a31d43d6a1f832951a9c984127e27622211a /sys/shm | |
| parent | 9fcfa6046d0e8e8ec89c32d7091b747088265d70 (diff) | |
| parent | 1cbd755a2cd45531076c7b19ef194b77d5575cb0 (diff) | |
| download | gstreamer-plugins-bad-1119f6ee4103990ccc55d521be08bdce10737c8e.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
ext/chromaprint/gstchromaprint.c
ext/mpeg2enc/Makefile.am
ext/voaacenc/gstvoaacenc.c
gst/dvbsuboverlay/gstdvbsuboverlay.c
gst/mpegtsdemux/mpegtsbase.c
gst/sdp/gstsdpdemux.c
gst/videoparsers/gsth264parse.c
sys/d3dvideosink/d3dvideosink.c
tests/examples/camerabin/gst-camera-perf.c
tests/examples/camerabin/gst-camerabin-test.c
tests/examples/camerabin2/gst-camerabin2-test.c
tests/examples/mxf/mxfdemux-structure.c
tests/examples/scaletempo/demo-main.c
Diffstat (limited to 'sys/shm')
| -rw-r--r-- | sys/shm/Makefile.am | 4 | ||||
| -rw-r--r-- | sys/shm/gstshmsink.c | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sys/shm/Makefile.am b/sys/shm/Makefile.am index bfe7b49fe..f62e20e1a 100644 --- a/sys/shm/Makefile.am +++ b/sys/shm/Makefile.am @@ -5,9 +5,9 @@ include $(top_srcdir)/common/glib-gen.mak plugin_LTLIBRARIES = libgstshm.la libgstshm_la_SOURCES = shmpipe.c shmalloc.c gstshm.c gstshmsrc.c gstshmsink.c -libgstshm_la_CFLAGS = $(GST_CFLAGS) -DSHM_PIPE_USE_GLIB +libgstshm_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS) -DSHM_PIPE_USE_GLIB libgstshm_la_LIBADD = -lrt -libgstshm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) +libgstshm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) libgstshm_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstshmsrc.h gstshmsink.h shmpipe.h shmalloc.h diff --git a/sys/shm/gstshmsink.c b/sys/shm/gstshmsink.c index 64490cf92..a4d705635 100644 --- a/sys/shm/gstshmsink.c +++ b/sys/shm/gstshmsink.c @@ -27,6 +27,7 @@ #include "gstshmsink.h" #include <gst/gst.h> +#include <gst/glib-compat-private.h> #include <string.h> @@ -512,12 +513,15 @@ pollthread_func (gpointer data) { GstShmSink *self = GST_SHM_SINK (data); GList *item; + GstClockTime timeout = GST_CLOCK_TIME_NONE; while (!self->stop) { - if (gst_poll_wait (self->poll, GST_CLOCK_TIME_NONE) < 0) + if (gst_poll_wait (self->poll, timeout) < 0) return NULL; + timeout = GST_CLOCK_TIME_NONE; + if (self->stop) return NULL; @@ -561,6 +565,7 @@ pollthread_func (gpointer data) functions on that new descriptor, so restart the loop, so _wait will have been called on all elements of self->poll, whether they have just been added or not. */ + timeout = 0; continue; } |