Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 24 May 2011 07:47:15 +0000 (09:47 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 24 May 2011 07:47:15 +0000 (09:47 +0200)
commita87c02123746982e10032ed02dc7b8b4df35b3f7
tree533a86f245acc6c4cc5f113a455887d5dce01a55
parent453091137e40cdbb313ecdd6c2db59d3e53dc4df
parent8da23e9d0ba6488f0117618a6e36cc6196f7cb98
Merge branch 'master' into 0.11

Conflicts:
gst-libs/gst/video/convertframe.c
14 files changed:
gst-libs/gst/app/gstappsink.c
gst-libs/gst/app/gstappsrc.c
gst-libs/gst/audio/gstaudiofilter.h
gst-libs/gst/audio/gstbaseaudiosink.c
gst-libs/gst/audio/gstringbuffer.h
gst-libs/gst/rtp/gstbasertpaudiopayload.c
gst-libs/gst/rtp/gstbasertpdepayload.c
gst-libs/gst/rtp/gstbasertpdepayload.h
gst-libs/gst/rtp/gstbasertppayload.c
gst-libs/gst/rtp/gstbasertppayload.h
gst-libs/gst/tag/gstxmptag.c
gst-libs/gst/video/convertframe.c
gst-libs/gst/video/video.c
gst/subparse/gstsubparse.c