Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 10 Feb 2012 14:41:06 +0000 (15:41 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 10 Feb 2012 14:41:06 +0000 (15:41 +0100)
commitc3478b2da0e42d3daeaa4616aeb220dbe831e6a5
tree41b1787db35c49039f81cf212124f03a9361b1c9
parente615e4c2cffbc0e5443f706651884642e1d91ef2
parente832929080de83454cf4dac0f5aa194a3e0874ca
Merge branch 'master' into 0.11

Conflicts:
ext/vorbis/gstvorbisparse.c
gst-libs/gst/video/video.c
gst/videoscale/gstvideoscale.c
sys/v4l/gstv4lxoverlay.c
sys/v4l/v4l_calls.c
sys/v4l/v4lsrc_calls.c
tests/check/libs/video.c
ext/ogg/gstoggdemux.c
ext/ogg/gstoggstream.c
ext/theora/gsttheoraenc.c
ext/vorbis/gstvorbisparse.c
gst/typefind/gsttypefindfunctions.c
gst/videoscale/gstvideoscale.c
tests/check/libs/video.c