Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 28 Feb 2011 11:06:12 +0000 (12:06 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 28 Feb 2011 11:06:12 +0000 (12:06 +0100)
commit2eb38991c6d67e47ef90246b2561588cf4b5f390
treeaa84497e9b719c9a2c1a5bf8657a3cdcae32c9d6
parent670c883f401367e2591f446e63b5102cb2aba72f
parenta68137c4dcdbf3dce5cd278403478aef1de62f59
Merge branch 'master' into 0.11

Conflicts:
configure.ac
win32/common/config.h
configure.ac
gst/jp2kdecimator/jp2kcodestream.c
gst/mxf/mxfdemux.c
gst/rtpvp8/gstrtpvp8.c