Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 17 Nov 2011 16:07:41 +0000 (17:07 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 17 Nov 2011 16:07:41 +0000 (17:07 +0100)
commit7afdff3575a626b776b7ab075f50a8d327e4495a
tree46457056aa450a5915c1539b3da55bdfcc58aa3e
parent3a534515017f817670e5882bbd3c2550fe37c485
parent80658564aed319fbe1c44697f73287fcd3bd7571
Merge branch 'master' into 0.11

Conflicts:
gst-libs/gst/audio/gstaudiodecoder.c
ext/vorbis/gstvorbisenc.c
gst-libs/gst/audio/gstaudiodecoder.c
gst-libs/gst/audio/gstaudioencoder.c
gst-libs/gst/rtp/gstrtcpbuffer.h