review.tizen.org Git - platform/upstream/gst-plugins-base.git/commit

projects / platform / upstream / gst-plugins-base.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cd8742f bd900a6)

author	Sebastian Dröge <sebastian.droege@collabora.co.uk>
	Wed, 25 Jan 2012 10:50:54 +0000 (11:50 +0100)
committer	Sebastian Dröge <sebastian.droege@collabora.co.uk>
	Wed, 25 Jan 2012 10:50:54 +0000 (11:50 +0100)
commit	68c0790817b4dedf8d4d028631e98d66171e73c0
tree	1063f6bb873d4ab3bee85e2310e06ad9f9232261	tree \| snapshot
parent	cd8742fdcb71e9bb3f987e5f98594c20b5c08134	commit \| diff
parent	bd900a6c856c536c783aa7a53e3c6b19f3cb8bf9	commit \| diff

Merge branch 'master' into 0.11

Conflicts:
gst-libs/gst/interfaces/propertyprobe.c
sys/xvimage/xvimagesink.c

15 files changed:

Android.mk	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
ext/alsa/gstalsasink.c	diff1 \|	diff2 \|	blob \| history
ext/ogg/gstoggstream.c	diff1 \|	diff2 \|	blob \| history
ext/vorbis/gstvorbisdec.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/audio/gstaudiobasesink.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/audio/gstaudiodecoder.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/tag/gstexiftag.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gstdecodebin2.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gstplaybin2.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gstplaysink.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gststreamsynchronizer.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gstsubtitleoverlay.c	diff1 \|	diff2 \|	blob \| history
sys/xvimage/xvimagepool.c	diff1 \|	\|	blob \| history
tools/gst-discoverer.c	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Media Common;