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

projects / platform / upstream / gstreamer.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e9eb791 252c1af)

author	Wim Taymans <wim.taymans@collabora.co.uk>
	Thu, 2 Jun 2011 16:51:29 +0000 (18:51 +0200)
committer	Wim Taymans <wim.taymans@collabora.co.uk>
	Thu, 2 Jun 2011 16:51:29 +0000 (18:51 +0200)
commit	0b1bdcf7cb6d4bed1b74ab1247e757dc4a4962d4
tree	ba0d713b2ef977089c3a662642a9ef1c9ac6b44b	tree \| snapshot
parent	e9eb7919c72148c58860b21e2d4e4f115b4e4be6	commit \| diff
parent	252c1afcc2df8c8daafd98c45974c55f931d0a9f	commit \| diff

Merge branch 'master' into 0.11

Conflicts:
sys/ximage/ximageutil.c

gst/avi/gstavimux.c	diff1 \|	diff2 \|	blob \| history
gst/matroska/matroska-demux.c	diff1 \|	diff2 \|	blob \| history
gst/rtsp/gstrtspsrc.c	diff1 \|	diff2 \|	blob \| history
gst/udp/gstudpsrc.c	diff1 \|	diff2 \|	blob \| history
sys/ximage/ximageutil.c	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Media Common;