Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 2 Nov 2011 09:40:12 +0000 (10:40 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 2 Nov 2011 09:40:12 +0000 (10:40 +0100)
commit22eb0d2300f1dd42ff6061bffbc6a08e38f4efa1
treef03f373fa7c4736eba596e294dacea9a2ac09bdd
parent83ccefb24e059f7283ac498f93658e2fe204064a
parent57684fee3a83fe5e463ca4a5c56f755f74aac676
Merge branch 'master' into 0.11
gst/isomp4/gstqtmux.c