Sebastian Dröge f7939bb43f Merge branch 'master' into 0.11 ... Conflicts: NEWS RELEASE configure.ac docs/plugins/gst-plugins-base-plugins.args docs/plugins/gst-plugins-base-plugins.hierarchy docs/plugins/gst-plugins-base-plugins.interfaces docs/plugins/inspect/plugin-adder.xml docs/plugins/inspect/plugin-alsa.xml docs/plugins/inspect/plugin-app.xml docs/plugins/inspect/plugin-audioconvert.xml docs/plugins/inspect/plugin-audiorate.xml docs/plugins/inspect/plugin-audioresample.xml docs/plugins/inspect/plugin-audiotestsrc.xml docs/plugins/inspect/plugin-cdparanoia.xml docs/plugins/inspect/plugin-encoding.xml docs/plugins/inspect/plugin-ffmpegcolorspace.xml docs/plugins/inspect/plugin-gdp.xml docs/plugins/inspect/plugin-gio.xml docs/plugins/inspect/plugin-gnomevfs.xml docs/plugins/inspect/plugin-libvisual.xml docs/plugins/inspect/plugin-ogg.xml docs/plugins/inspect/plugin-pango.xml docs/plugins/inspect/plugin-playback.xml docs/plugins/inspect/plugin-subparse.xml docs/plugins/inspect/plugin-tcp.xml docs/plugins/inspect/plugin-theora.xml docs/plugins/inspect/plugin-typefindfunctions.xml docs/plugins/inspect/plugin-uridecodebin.xml docs/plugins/inspect/plugin-videorate.xml docs/plugins/inspect/plugin-videoscale.xml docs/plugins/inspect/plugin-videotestsrc.xml docs/plugins/inspect/plugin-volume.xml docs/plugins/inspect/plugin-vorbis.xml docs/plugins/inspect/plugin-ximagesink.xml docs/plugins/inspect/plugin-xvimagesink.xml gst-libs/gst/app/gstappsink.c gst-libs/gst/audio/mixer.c gst-libs/gst/audio/mixer.h gst-libs/gst/tag/gstxmptag.c gst-libs/gst/video/colorbalance.c gst-libs/gst/video/colorbalance.h gst/adder/gstadder.c gst/playback/gstplaybasebin.c gst/playback/gstplaybin2.c gst/playback/gstplaysink.c gst/videoscale/gstvideoscale.c tests/check/elements/videoscale.c tests/examples/seek/seek.c tests/examples/v4l/probe.c win32/common/_stdint.h win32/common/audio-enumtypes.c win32/common/config.h		2012-03-02 10:00:55 +01:00
..
app	Merge branch 'master' into 0.11	2012-03-02 10:00:55 +01:00
audio	Merge branch 'master' into 0.11	2012-03-02 10:00:55 +01:00
fft	Merge remote-tracking branch 'origin/master' into 0.11	2011-12-02 11:10:17 +00:00
interfaces	Merge branch 'master' into 0.11	2012-03-02 10:00:55 +01:00
pbutils	pbutils: fix gst_install_plugins_{sync,async} g-i annotations	2012-02-25 00:39:53 +00:00
riff	riff: fix compilation on big-endian	2012-02-22 21:22:06 +00:00
rtp	update for new memory api	2012-02-22 02:05:24 +01:00
rtsp	rtsp: fix connection	2012-02-20 17:44:59 +01:00
sdp	sdp: Port to GIO for multicast address detection	2012-01-17 13:27:05 +01:00
tag	Merge branch 'master' into 0.11	2012-03-02 10:00:55 +01:00
video	Merge branch 'master' into 0.11	2012-03-02 10:00:55 +01:00
gettext.h	Fix for ENABLE_NLS being undefined for -Wundef	2010-03-16 18:06:16 +01:00
glib-compat-private.h	Remove compatibility code cruft for old GLib versions	2012-01-18 17:22:21 +00:00
gst-i18n-plugin.h	*.h: Revert indenting	2004-03-15 16:32:55 +00:00
Makefile.am	Merge remote-tracking branch 'origin/master' into 0.11	2011-12-08 01:19:03 +00:00