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
..
playback	tests: use playbin, not playbin2	2012-01-30 09:57:47 +01:00
.gitignore	tests: update for GstXOverlay => GstVideoOverlay	2011-08-08 14:12:15 +01:00
audio-trickplay.c	controller: adapt to control-source type changes	2012-01-31 12:28:30 +01:00
input-selector-test.c	tests: move examples directory to tests/examples as in every other GStreamer module	2010-12-31 01:15:29 +00:00
Makefile.am	tests: More fixes for moved interfaces	2011-11-29 19:31:55 +01:00
output-selector-test.c	update for request pads change.	2011-11-03 17:58:57 +01:00
playbin-text.c	tests: use playbin, not playbin2	2012-01-30 09:57:47 +01:00
position-formats.c	tests: use playbin, not playbin2	2012-01-30 09:57:47 +01:00
stress-playbin.c	tests: use playbin, not playbin2	2012-01-30 09:57:47 +01:00
stress-videooverlay.c	video: move some interfaces	2011-11-29 19:10:01 +01:00
test-box.c	ffmpegcolorspace -> videoconvert	2011-07-07 23:59:59 +01:00
test-colorkey.c	Merge branch 'master' into 0.11	2012-03-02 10:00:55 +01:00
test-scale.c	ffmpegcolorspace -> videoconvert	2011-07-07 23:59:59 +01:00
test-textoverlay.c	ffmpegcolorspace -> videoconvert	2011-07-07 23:59:59 +01:00
test-videooverlay.c	Suppress deprecations in selected files	2012-01-25 14:49:44 +01:00