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	update for new memory api	2012-02-22 02:05:24 +01:00
audio	Suppress deprecations in selected files	2012-01-25 14:49:44 +01:00
dynamic	fix pad template names for request pads	2011-11-04 10:49:48 +01:00
encoding	Remove compatibility code cruft for old GLib versions	2012-01-18 17:22:21 +00:00
fft	examples: fix build of fft example	2011-12-06 15:01:05 +00:00
gio	gio: Move to gst subdirectory	2012-01-18 16:21:14 +01:00
overlay	Remove compatibility code cruft for old GLib versions	2012-01-18 17:22:21 +00:00
playrec	tests: fix unused-but-set-variable warnings with gcc 4.6	2011-04-14 00:24:26 +01:00
seek	Merge branch 'master' into 0.11	2012-03-02 10:00:55 +01:00
snapshot	port to new map API	2012-01-25 12:30:53 +01:00
Makefile.am	gio: Move to gst subdirectory	2012-01-18 16:21:14 +01:00