Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 25 Apr 2011 09:38:28 +0000 (11:38 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 25 Apr 2011 09:38:28 +0000 (11:38 +0200)
commita1894ed36373d3e0f43f1ac2f1fa0e9cfbfed215
treebf74474a260fee7da60fa594e8b6a9e69803b0a2
parent2f9a7b1a1b531a81f4e3d6829130d10e92598bcf
parentbddac509612362a53a4636dfb53cc9e097f7bf53
Merge branch 'master' into 0.11
configure.ac
gst/avi/gstavimux.c
gst/rtpmanager/rtpsession.c