Wim Taymans 33467d9629 Merge branch 'master' into 0.11 ...

Conflicts:
	configure.ac
	ext/pango/gsttextoverlay.c
	ext/theora/gsttheoradec.c
	gst/adder/gstadder.c
	gst/adder/gstadder.h
	gst/audioresample/gstaudioresample.c
	gst/encoding/gstencodebin.c
	gst/playback/gstdecodebin.c
	gst/playback/gstdecodebin2.c
	tests/check/elements/decodebin2.c
	tests/check/elements/playbin-compressed.c
	win32/common/libgsttag.def

2011-08-16 18:01:14 +02:00

..

common

Merge branch 'master' into 0.11

2011-08-16 18:01:14 +02:00

vs6

ffmpegcolorspace -> videoconvert

2011-07-07 23:59:59 +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

ffmpegcolorspace -> videoconvert

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