Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 8 Jul 2011 10:51:14 +0000 (12:51 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 8 Jul 2011 10:51:14 +0000 (12:51 +0200)
1  2 
gst/isomp4/gstqtmux.c
gst/isomp4/gstqtmuxmap.c
gst/matroska/matroska-demux.c

Simple merge
Simple merge
Simple merge