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)
commit734ec56617e188d82973d858605672b1ee7f4547
tree78d7f4b8036c35a56490040551eda7dd571bfad8
parente20d6f0bb5b7727187bdb0d1a74da4d6728127a8
parenta2e0bda3b5d40b545355267bea042a4bdccc46c9
Merge branch 'master' into 0.11
gst/isomp4/gstqtmux.c
gst/isomp4/gstqtmuxmap.c
gst/matroska/matroska-demux.c