Merge branch 'master' into 0.11
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Mon, 4 Jul 2011 09:48:13 +0000 (11:48 +0200)
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Mon, 4 Jul 2011 09:48:13 +0000 (11:48 +0200)
commitd59a00aa1cc792ca1437760bb10164d1eba2eae9
tree8d36333e6ec74909d1f6a6786fc7f7b3d266a459
parent611c950868da11cd035737c084e8a00af64d6ae1
parentb307c74e9e4ad3eb80339e685feb187ff929558a
Merge branch 'master' into 0.11

Conflicts:
ext/pulse/pulsesink.c
configure.ac
ext/pulse/pulsesink.c
ext/pulse/pulsesrc.c
gst/audioparsers/gstaacparse.c
gst/flv/gstflvdemux.c
gst/isomp4/gstqtmux.c
gst/matroska/matroska-demux.c