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)
1  2 
ext/flac/gstflacdec.c
gst/audioparsers/gstaacparse.c

Simple merge
Simple merge