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

..

basecamerabinsrc

Merge remote-tracking branch 'origin/master' into 0.11-premerge

2011-12-30 11:41:17 +01:00

codecparsers

codecparsers: mpeg4: fix parsing when recursively skipping user data

2012-01-09 15:03:30 +01:00

interfaces

interfaces: clean up the use of iface and class/klass

2011-10-21 15:04:05 +02:00

signalprocessor

signalprocessor: The multichannel.h header is gone now

2012-01-05 10:38:22 +01:00

video

Merge branch 'master' into 0.11

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

gettext.h

i18n: build fixes: #if -> #ifdef for ENABLE_NLS

2010-03-22 18:07:45 +02:00

gst-i18n-plugin.h

i18n: fix the build

2010-03-22 18:01:27 +02:00

Makefile.am

basecamerasrc: port to 0.11

2011-11-24 11:59:19 +01:00