Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 28 Sep 2011 13:46:40 +0000 (15:46 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 28 Sep 2011 13:46:40 +0000 (15:46 +0200)
commitf97a9bdc68e37b2d555e8dd3051eca8dfa01ca08
treef99b1296086e305824defd2cac262ce33df0301a
parent19626cf27ae853ee7c0b44cfd572c8c34103a14a
parent8633eb391da28e5e645912d0b62b99ee46e5224d
Merge branch 'master' into 0.11
gst-libs/gst/audio/gstaudiodecoder.c
gst-libs/gst/audio/gstaudioencoder.c