gstreamer/win32
Wim Taymans e1287b97ab Merge branch 'master' into 0.11
Conflicts:
	ext/ogg/gstoggmux.c
	gst-libs/gst/audio/audio.c
	gst-libs/gst/audio/audio.h
	gst-libs/gst/audio/multichannel.h
	gst-libs/gst/pbutils/Makefile.am
	gst-libs/gst/pbutils/gstdiscoverer.c
	gst/playback/gstplaysinkaudioconvert.c
	gst/playback/gstplaysinkvideoconvert.c
	win32/common/libgstaudio.def
2011-08-29 11:37:36 +02:00
..
common Merge branch 'master' into 0.11 2011-08-29 11:37:36 +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