review.tizen.org Git - platform/upstream/gstreamer.git/commit

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

author	Sebastian Dröge <sebastian.droege@collabora.co.uk>
	Fri, 2 Mar 2012 09:00:55 +0000 (10:00 +0100)
committer	Sebastian Dröge <sebastian.droege@collabora.co.uk>
	Fri, 2 Mar 2012 09:00:55 +0000 (10:00 +0100)
commit	f7939bb43fca241472a61d394f2457f5978dd5ab
tree	5544f06f6732b62455192c20805cede6216ad9eb	tree \| snapshot
parent	502c12f8274ba97e96c8b2501550201199fdb49c	commit \| diff
parent	87d41b87a0bf12a403221964a8588bf611b15c6a	commit \| diff

ext/alsa/gstalsadeviceprobe.c	diff1 \|	diff2 \|	blob \| history
ext/theora/gsttheoraenc.c	diff1 \|	diff2 \|	blob \| history
ext/theora/gsttheoraparse.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/app/gstappsink.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/audio/mixer.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/audio/mixer.h	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/audio/mixerutils.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/interfaces/navigation.h	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/tag/gstxmptag.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/video/colorbalance.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/video/colorbalance.h	diff1 \|	diff2 \|	blob \| history
gst/adder/gstadder.c	diff1 \|	diff2 \|	blob \| history
gst/adder/gstadder.h	diff1 \|	diff2 \|	blob \| history
gst/playback/gstplay-enum.h	diff1 \|	diff2 \|	blob \| history
gst/playback/gstplaybin2.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gstplaysink.c	diff1 \|	diff2 \|	blob \| history
gst/videoscale/gstvideoscale.c	diff1 \|	diff2 \|	blob \| history
sys/xvimage/xvimagesink.c	diff1 \|	diff2 \|	blob \| history
tests/check/elements/adder.c	diff1 \|	diff2 \|	blob \| history
tests/check/elements/alsa.c	diff1 \|	diff2 \|	blob \| history
tests/check/elements/playbin.c	diff1 \|	diff2 \|	blob \| history
tests/check/elements/videoscale.c	diff1 \|	diff2 \|	blob \| history
tests/examples/seek/seek.c	diff1 \|	diff2 \|	blob \| history
tests/icles/test-colorkey.c	diff1 \|	diff2 \|	blob \| history
win32/common/config.h	diff1 \|	diff2 \|	blob \| history