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
..
gstchromahold.c	Merge branch 'master' into 0.11	2012-02-10 16:46:50 +01:00
gstchromahold.h	coloreffects: Coding style fixes	2011-05-14 12:08:39 +02:00
gstcoloreffects.c	Merge branch 'master' into 0.11	2012-01-10 15:50:37 +01:00
gstcoloreffects.h	coloreffects: added support for a visual magnifier color filter to be used in gnome-video-effects	2012-01-06 11:24:45 +00:00
gstplugin.c	chromahold: Add chromahold color effect	2010-10-06 11:57:12 +02:00
Makefile.am	controller: port to new controller location and api	2011-11-04 20:14:01 +01:00