gstreamer/ext/modplug
Wim Taymans 1119f6ee41 Merge branch 'master' into 0.11
Conflicts:
	ext/chromaprint/gstchromaprint.c
	ext/mpeg2enc/Makefile.am
	ext/voaacenc/gstvoaacenc.c
	gst/dvbsuboverlay/gstdvbsuboverlay.c
	gst/mpegtsdemux/mpegtsbase.c
	gst/sdp/gstsdpdemux.c
	gst/videoparsers/gsth264parse.c
	sys/d3dvideosink/d3dvideosink.c
	tests/examples/camerabin/gst-camera-perf.c
	tests/examples/camerabin/gst-camerabin-test.c
	tests/examples/camerabin2/gst-camerabin2-test.c
	tests/examples/mxf/mxfdemux-structure.c
	tests/examples/scaletempo/demo-main.c
2012-02-10 16:46:50 +01:00
..
gstmodplug.cc Merge branch 'master' into 0.11 2012-02-10 16:46:50 +01:00
gstmodplug.h modplug: Allow 32 bit depth, modplugs native format. 2010-01-04 10:18:51 +01:00
Makefile.am Build the modplug plugin against the modplug library and remove our copy 2009-01-24 18:13:39 +01:00