Merge commit '4a58223e4c824fedc024af435337a769e8ce593e' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 21:20:10 +0000 (21:20 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 21:20:10 +0000 (21:20 +0000)
commit0c056a04fef958d26e93824d276541d8f2c3dcad
tree5b698f66a91207ca1077ad16f669ada416d7452d
parent5b868bd4244bbcae0b40f193c78f1cfa7c119c94
parent4a58223e4c824fedc024af435337a769e8ce593e
Merge commit '4a58223e4c824fedc024af435337a769e8ce593e' into 0.11
ext/alsa/gstalsasrc.c
gst-libs/gst/audio/gstaudiodecoder.c
gst-libs/gst/audio/gstaudiodecoder.h
gst-libs/gst/audio/gstaudioencoder.c
gst-libs/gst/audio/gstaudioencoder.h