Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 17 Jun 2011 16:12:50 +0000 (18:12 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 17 Jun 2011 16:12:50 +0000 (18:12 +0200)
commit7ef71579863a2c052a87f112e662075ee026d6c6
tree03fa253398e70fa326cf9fa49496ca1633db03fe
parent582e18b673f7e7aba2fed0cce323633a40ab5336
parent6c3e77964ad84bdfc9b2bf20b04b6137892e028d
Merge branch 'master' into 0.11
gst/audiofx/audioecho.c
gst/audioparsers/gstac3parse.c
gst/audioparsers/gstmpegaudioparse.c