diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-12-08 01:19:03 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-12-08 01:19:03 +0000 |
| commit | fb6d09055ae90979682fa4b1c6ee4f4abdaafd8f (patch) | |
| tree | 3215796950bfe6630098dff0d3897996ba8882ab /tools | |
| parent | f096b8a8d81239e22477f222d774f8c48a03b06e (diff) | |
| parent | 91bbfbd819f6a347be114ee280dd5bb5b0ab1385 (diff) | |
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
ext/alsa/gstalsadeviceprobe.c
ext/alsa/gstalsamixer.c
ext/pango/gsttextoverlay.c
ext/pango/gsttextoverlay.h
gst-libs/gst/audio/gstaudiobasesink.c
gst-libs/gst/audio/gstaudioringbuffer.c
gst-libs/gst/audio/gstaudiosrc.c
gst-libs/gst/video/Makefile.am
gst-libs/gst/video/video.c
gst/encoding/gststreamcombiner.c
gst/encoding/gststreamsplitter.c
gst/playback/gstplaybasebin.c
gst/playback/gststreamsynchronizer.c
gst/playback/gstsubtitleoverlay.c
gst/playback/gsturidecodebin.c
sys/xvimage/xvimagesink.c
tests/examples/Makefile.am
win32/common/libgstvideo.def
Video overlay composition disabled for now, needs
porting to buffer meta.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gst-discoverer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/gst-discoverer.c b/tools/gst-discoverer.c index 5b2a74be4..c29045d80 100644 --- a/tools/gst-discoverer.c +++ b/tools/gst-discoverer.c @@ -499,8 +499,10 @@ main (int argc, char **argv) }; GOptionContext *ctx; +#if !GLIB_CHECK_VERSION (2, 31, 0) if (!g_thread_supported ()) g_thread_init (NULL); +#endif ctx = g_option_context_new |