Wim Taymans 0a9387c43c Merge branch 'master' into 0.11 ... Conflicts: ext/opus/gstopusdec.c ext/opus/gstopusenc.c ext/opus/gstopusparse.c gst/audiovisualizers/gstwavescope.c gst/filter/Makefile.am gst/filter/gstfilter.c gst/filter/gstiir.c gst/playondemand/gstplayondemand.c		2011-11-23 11:08:39 +01:00
..
camerabin2-src.txt	camerabin2: Adding camera source documentation file	2011-05-16 18:08:39 -03:00
camerabingeneral.c	camerabin2: don't mess with camerabin (1) namespace	2011-07-08 00:11:37 -07:00
camerabingeneral.h	camerabin2: Move preview helper functions to basecamerabinsrc	2011-03-10 08:42:00 -03:00
gstcamerabin2.c	camerabin2: Also reset video/audio filters before capturing	2011-11-19 16:22:29 -03:00
gstcamerabin2.h	camerabin2: Remove video elements' state clearing from start-capture	2011-11-14 13:06:29 -03:00
gstplugin.c	camerabin2: don't mess with camerabin (1) namespace	2011-07-08 00:11:37 -07:00
gstviewfinderbin.c	camerabin2: viewfinderbin: Add property for disabling converters	2011-08-23 11:19:51 -03:00
gstviewfinderbin.h	camerabin2: viewfinderbin: Add property for disabling converters	2011-08-23 11:19:51 -03:00
gstwrappercamerabinsrc.c	more template fixes	2011-11-04 12:31:19 +01:00
gstwrappercamerabinsrc.h	camerabin2: Adding a filter to wrappercamerabinsrc	2011-06-02 16:24:03 -03:00
Makefile.am	camerabin2: Remove obsolete imagecapturebin	2011-05-16 18:08:41 -03:00
PORTING	camerabin2: add location=NULL docs to PORTING	2011-07-25 10:32:51 -03:00