gstreamer/win32
Wim Taymans 7012e88090 Merge branch 'master' into 0.11
Conflicts:
	gst-libs/gst/audio/audio.h
	gst-libs/gst/audio/gstaudiodecoder.c
	gst-libs/gst/audio/gstaudiodecoder.h
	gst-libs/gst/audio/gstaudioencoder.c
	gst-libs/gst/audio/gstbaseaudioencoder.h
	gst/playback/Makefile.am
	gst/playback/gstplaybin.c
	gst/playback/gstplaysink.c
	gst/playback/gstplaysinkvideoconvert.c
	gst/playback/gstsubtitleoverlay.c
	gst/videorate/gstvideorate.c
	gst/videoscale/gstvideoscale.c
	win32/common/libgstaudio.def
2011-09-06 15:24:32 +02:00
..
common Merge branch 'master' into 0.11 2011-09-06 15:24:32 +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