Tim-Philipp Müller 32b14c6ed3 Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
	ext/vorbis/gstvorbisenc.c
	gst/playback/gstdecodebin2.c
	gst/playback/gstplaysinkconvertbin.c
	gst/videorate/gstvideorate.c
2011-11-26 12:12:59 +00:00
..
2011-10-27 17:26:58 +02:00
2005-12-06 19:42:02 +00:00
2004-07-27 21:41:30 +00:00