gstreamer/gst/adpcmenc
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
..
adpcmenc.c Merge branch 'master' into 0.11 2012-01-25 13:22:43 +01:00
Makefile.am adpcmenc: port to audioencoder 2012-01-17 21:37:45 +01:00