Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 22 Mar 2012 10:55:28 +0000 (11:55 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 22 Mar 2012 10:55:28 +0000 (11:55 +0100)
commit7c9a54aa076be1c8741f7faf2843eb331f75b93a
tree4eee76083a7d3c9a8cc0d9428c49654f31597e68
parentc44cd8f55bc0bf409e86b039cad0e2f757d5c77e
parent072ac37bb228b9b14add478746820ff6ba58138e
Merge branch 'master' into 0.11
gst/smpte/gstsmpte.c