Merge branch 'master' of ssh://git.freedesktop.org/git/gstreamer/gst-plugins-base
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 5 Jan 2010 09:38:41 +0000 (10:38 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 5 Jan 2010 09:38:41 +0000 (10:38 +0100)
1  2 
gst/playback/gstdecodebin2.c

Simple merge