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)
1  2 
gst/smpte/gstsmpte.c

Simple merge