Sebastian Dröge dc8984d76c Merge branch 'master' into 0.11 ...

Conflicts:
	gst-libs/gst/app/gstappsrc.c
	gst-libs/gst/audio/multichannel.h
	gst-libs/gst/video/videooverlay.c
	gst/playback/gstplaysink.c
	gst/playback/gststreamsynchronizer.c
	tests/check/Makefile.am
	win32/common/libgstvideo.def

2012-01-10 13:15:12 +01:00

..

common

Merge branch 'master' into 0.11

2012-01-10 13:15:12 +01: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