Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 2 Jun 2011 10:18:13 +0000 (12:18 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 2 Jun 2011 10:18:13 +0000 (12:18 +0200)
commitf9967e4aac4e050e3ed4883c03a7ca639b477a68
treee00253eb3ebfc5dbbc41079de0c1c998775a8f8f
parentea672b68a1744994188db278ca5446053d61d34d
parent5c97aa2e5cbd74ba960cc9bc2e1c3d7ae92d51b4
Merge branch 'master' into 0.11

Conflicts:
gst-libs/gst/video/video.h
gst/playback/gstplaysinkaudioconvert.c
gst/playback/gstplaysinkvideoconvert.c
tests/check/libs/rtp.c
configure.ac
gst-libs/gst/video/video.h
gst/volume/gstvolume.c
tests/check/elements/ffmpegcolorspace.c
tests/check/elements/volume.c
tests/check/elements/vorbistag.c
tests/check/libs/libsabi.c
tests/check/libs/rtp.c
win32/common/libgstvideo.def