gstreamer/win32
Tim-Philipp Müller ec0d3566bf Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
	ext/alsa/gstalsasrc.c
	ext/alsa/gstalsasrc.h
	gst/adder/gstadder.c
	gst/playback/gstplaybin2.c
	gst/playback/gstplaysinkconvertbin.c
	win32/common/libgstvideo.def
2011-12-02 00:07:39 +00:00
..
common Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 00:07:39 +00:00
vs6 cdda: rename GstCddaBaseSrc to GstAudioCdSrc and move to libgstaudio 2011-11-12 11:58:58 +00:00
vs7 ffmpegcolorspace -> videoconvert 2011-07-07 23:59:59 +01:00
vs8 ffmpegcolorspace -> videoconvert 2011-07-07 23:59:59 +01:00
MANIFEST cdda: rename GstCddaBaseSrc to GstAudioCdSrc and move to libgstaudio 2011-11-12 11:58:58 +00:00