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)
1  2 
gst/isomp4/gstqtmux.c

Simple merge