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
..
gstchromahold.c	various: fix pad template ref leaks	2011-11-28 13:08:27 +00: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