Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 17 May 2011 14:13:59 +0000 (16:13 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 17 May 2011 14:13:59 +0000 (16:13 +0200)
commite15651816e8420ee7e4584a161699be4cd81cdef
tree93493c289da9c8913a990fc8d458a3b11e790e33
parentcf1248e566ca460f4c24daef39d2ff488974c246
parentdc2ddea91befb4bc38116f4e08e459f99e0b3329
Merge branch 'master' into 0.11
gst/rtsp/gstrtspsrc.c
sys/v4l2/gstv4l2object.c