gstreamer/gst-libs
Sebastian Dröge a2a4300241 Merge branch 'master' into 0.11
Conflicts:
	configure.ac
	ext/kate/gstkateenc.c
	gst/colorspace/colorspace.c
	gst/mpegvideoparse/mpegvideoparse.c
2012-01-25 13:22:43 +01:00
..
gst Merge branch 'master' into 0.11 2012-01-25 13:22:43 +01:00
Makefile.am Use external shared libamrwb. Fixes #423741 (with lots of cleanup). 2007-05-16 13:50:51 +00:00