Sebastian Dröge a01a4ea2d3 Merge branch 'master' into 0.11 ...

Conflicts:
	gst/mpegtsdemux/tsdemux.c
	gst/videoparsers/gsth264parse.c
	tests/check/elements/camerabin2.c

2012-01-10 15:50:37 +01:00

..

gst

Merge branch 'master' into 0.11

2012-01-10 15:50:37 +01:00

Makefile.am

Use external shared libamrwb. Fixes #423741 (with lots of cleanup).

2007-05-16 13:50:51 +00:00