gstreamer/win32
Wim Taymans f71511edd2 Merge branch 'master' into 0.11
Conflicts:
	gst-libs/gst/audio/gstaudiodecoder.c
	gst-libs/gst/audio/gstaudioencoder.c
	gst/encoding/gstencodebin.c
2011-09-26 19:22:05 +02:00
..
common Merge branch 'master' into 0.11 2011-09-26 19:22:05 +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