gstreamer/gst-libs
Wim Taymans 7ac25e9b26 Merge branch 'master' into 0.11
Conflicts:
	common
	configure.ac
	gst-libs/gst/audio/gstbaseaudiosink.c
	gst/playback/gstdecodebin2.c
	gst/playback/gstplaysinkaudioconvert.c
	gst/playback/gstplaysinkaudioconvert.h
	gst/playback/gstplaysinkvideoconvert.c
	gst/playback/gstplaysinkvideoconvert.h
2011-11-07 12:23:15 +01:00
..
ext move ffmpeg stuff to gst-ffmpeg module 2004-02-13 15:11:50 +00:00
gst Merge branch 'master' into 0.11 2011-11-07 12:23:15 +01:00
Makefile.am configure.ac: added GST_LIB_LDFLAGS and GST_ALL_LDFLAGS 2005-11-27 16:18:50 +00:00