gstreamer/gst-libs
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
..
ext move ffmpeg stuff to gst-ffmpeg module 2004-02-13 15:11:50 +00:00
gst Merge branch 'master' into 0.11 2011-08-29 11:37:36 +02:00
Makefile.am configure.ac: added GST_LIB_LDFLAGS and GST_ALL_LDFLAGS 2005-11-27 16:18:50 +00:00