Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 13 Jun 2011 17:09:05 +0000 (19:09 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 13 Jun 2011 17:09:05 +0000 (19:09 +0200)
commit40d567153a304efd35b56f92d195337cbee38496
treea9e26b2d349dc16c2433eb9ed22b042ffe311533
parent9c54ca5254bd8ee0d55a6bacd4b33715674d15ac
parent4db89c82bb756e963e4a9c1d64f59f0c0e41d841
Merge branch 'master' into 0.11
ext/ogg/gstoggmux.c
gst/audiotestsrc/gstaudiotestsrc.c