Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 16 Aug 2011 16:35:53 +0000 (18:35 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 16 Aug 2011 16:35:53 +0000 (18:35 +0200)
commit4bb2b140e9bc2b4ec98fee84796d5fb98d41f965
treefbe31659ff9fc68c38f3f6d3f462fd2692fa051d
parentdfd91ba704f5d84774c4ea72ed119dde537c90b6
parent6ac7ad8a2ce59bebcb5b5085fa48c354afff539f
Merge branch 'master' into 0.11

Conflicts:
sys/v4l2/v4l2src_calls.c
configure.ac
ext/jack/gstjackaudiosrc.c
gst/audioparsers/gstflacparse.c
gst/isomp4/qtdemux.c
gst/rtsp/gstrtspsrc.c
sys/v4l2/gstv4l2object.c
sys/ximage/gstximagesrc.c