Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 19 May 2011 09:31:53 +0000 (11:31 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 19 May 2011 09:31:53 +0000 (11:31 +0200)
commit489eed9bb8543ab49e128bee139110105042589a
treeda80120679b8bec26b5035c5c36f72ec3d4eb3e8
parent884213b8b874a1bad271c8164e00abda443cce42
parent0f7522e44994048cf60636b2d1725467d450bff6
Merge branch 'master' into 0.11
ext/alsa/gstalsasrc.c
ext/vorbis/gstvorbisdec.c
gst-libs/gst/video/video.c
gst-libs/gst/video/video.h
tests/check/libs/video.c