Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 27 Oct 2011 17:06:06 +0000 (19:06 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 27 Oct 2011 17:06:06 +0000 (19:06 +0200)
commitfacda96308eb675ffc5afc043358aa7b7d19cfb1
treeeb7d118a8e50a2e059a0fa7db6b6b4ad6012e4a0
parent9c14280b1d60ad71cd7fe249f5c1d66300efcc9f
parent3b03db5e403b3c8736d00aca8071113b656995c1
Merge branch 'master' into 0.11

Conflicts:
gst/flv/gstflvmux.c
gst/flv/gstflvmux.c