Merge remote-tracking branch 'origin/0.10'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 2 Apr 2012 13:31:38 +0000 (15:31 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 2 Apr 2012 13:31:38 +0000 (15:31 +0200)
commitbc07e445466f9ca39e43583745134f66b4acb2c1
treedd9ec189134bb0f875bcbd06054c7e7cab49b36a
parentc649050eb419c2d51f5df5eb9694cd3787c2a9ab
parent6800d0c4e086f97d0595465f55d2ac2143decd1e
Merge remote-tracking branch 'origin/0.10'

Conflicts:
gst/mpegtsdemux/tsdemux.c