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

..

camerabin

plenty: fixup glib deprecations

2012-01-27 15:47:07 +00:00

camerabin2

plenty: fixup glib deprecations

2012-01-27 15:47:07 +00:00

capsfilter

Move examples directory to tests/examples as in every other GStreamer module

2009-02-24 16:33:51 +01:00

directfb

Add -Wold-style-definition

2010-03-22 16:56:03 +01:00

gstplay

Move examples directory to tests/examples as in every other GStreamer module

2009-02-24 16:33:51 +01:00

indexing

indexing-example: use proper signal names

2011-02-18 15:00:05 +02:00

level

Move examples directory to tests/examples as in every other GStreamer module

2009-02-24 16:33:51 +01:00

mpegtsmux

mpegtsmux: Move multi-program muxing example at least to the correct directory

2010-05-07 08:15:42 +02:00

mxf

plenty: fixup glib deprecations

2012-01-27 15:47:07 +00:00

opencv

build: ignore GValueArray deprecation warnings for the time being

2012-02-01 17:54:22 +00:00

scaletempo

Merge branch 'master' into 0.11

2012-02-10 16:46:50 +01:00

stats

Move examples directory to tests/examples as in every other GStreamer module

2009-02-24 16:33:51 +01:00

Makefile.am

camerabin2: Remove from experimental

2011-08-23 19:26:31 -03:00