Wim Taymans d77c8cafee Merge branch 'master' into 0.11 ...

Conflicts:
	common
	ext/pango/gsttextoverlay.c
	gst-libs/gst/video/video.c

2011-11-09 12:11:59 +01:00

..

common

Merge branch 'master' into 0.11

2011-11-09 12:11:59 +01:00

vs6

Really remove all mention of gstnetbuffer

2011-11-04 09:01:36 +01:00

vs7

ffmpegcolorspace -> videoconvert

2011-07-07 23:59:59 +01:00

vs8

ffmpegcolorspace -> videoconvert

2011-07-07 23:59:59 +01:00

MANIFEST

Really remove all mention of gstnetbuffer

2011-11-04 09:01:36 +01:00