Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Sun, 10 Jul 2011 11:49:14 +0000 (13:49 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Sun, 10 Jul 2011 11:49:14 +0000 (13:49 +0200)
commit376164ab08378f4ed3744e21784e60fc314c7d30
tree0c01c2dbd5cc6005e4dde252a79df918ae198861
parent87e06b680823d0f461a002ff5f9b4ba35dddb1c7
parenta5323107d446e83cf096a69e11f8276a97bbfcb9
Merge branch 'master' into 0.11
ext/ogg/gstoggmux.c
gst/typefind/gsttypefindfunctions.c