Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 5 Apr 2011 15:20:08 +0000 (17:20 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 5 Apr 2011 15:20:08 +0000 (17:20 +0200)
commitc124ba14897b4c28f240d2bfea3ec67005d22d2a
treec15e72005fc5ecfe8b2516422dc09fe3325e4610
parentf67c95d82699b824cb18e3550d0ec5ece5d10860
parent547c97f59036030d8476f68b4725398c7545f8d3
Merge branch 'master' into 0.11

Conflicts:
gst/rtsp/gstrtspsrc.c
configure.ac
gst/qtdemux/qtdemux.c
gst/rtsp/gstrtspsrc.c