Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 3 Nov 2011 11:58:42 +0000 (12:58 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 3 Nov 2011 11:58:42 +0000 (12:58 +0100)
commitbace3995d519b82e9dbe1f70cbaeca04b0648634
tree683a6194d263e80d43e259ff6c4ffad0b02f4479
parent05c3928b11a9bfe27851b1ac21c8a088fc12a122
parenta701e8595e1fbf005be31cb5a01660e6acdb6818
Merge branch 'master' into 0.11
gst/rtsp-server/rtsp-media.c