Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 24 Aug 2011 12:16:44 +0000 (14:16 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 24 Aug 2011 12:16:44 +0000 (14:16 +0200)
commite9df54819c85da821f62eb34f4af4b6781f0c559
tree9ca69d0188d48dddf4daf4f02151dbcb0808b478
parent60f0e44bf6b717047b9d38523a07148f2966123c
parentf3fc3e1f69587e1bda5e628093918a2a3dd5f874
Merge branch 'master' into 0.11
ext/flac/gstflacdec.c
gst/audioparsers/gstaacparse.c