Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 18 Aug 2011 17:36:50 +0000 (19:36 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 18 Aug 2011 17:36:50 +0000 (19:36 +0200)
commitba41bb5ca78335dca05a320679ade19886a552fb
tree01e8df012493a86dbc13438bb4e7bc17ca12b7f4
parentdae848818da8685c3b74d94db115b8d7f7c9fb28
parent2ee31ccac93ebaf9fc8706b1d07f54dba1ad7eef
Merge branch 'master' into 0.11

Conflicts:
ext/ogg/gstoggmux.c
gst/playback/gstplaysink.c
ext/ogg/gstoggdemux.c
ext/ogg/gstoggmux.c
ext/ogg/gstoggstream.c
gst/audioresample/resample.c
gst/playback/gstplaysink.c