Edward Hervey 4917e16458 Merge remote-tracking branch 'origin/master' into 0.11 ... Conflicts: tests/examples/camerabin2/Makefile.am		2011-12-30 11:49:27 +01:00
..
camerabin2-src.txt	camerabin2: Adding camera source documentation file	2011-05-16 18:08:39 -03:00
camerabingeneral.c	Merge remote-tracking branch 'origin/master' into 0.11-premerge	2011-12-30 11:41:17 +01:00
camerabingeneral.h	camerabin2: remove unused helper function	2011-12-22 16:13:59 -03:00
gstcamerabin2.c	Merge remote-tracking branch 'origin/master' into 0.11	2011-12-30 11:49:27 +01:00
gstcamerabin2.h	camerabin2: Fix A/V sync for captures	2011-12-20 15:05:27 -03:00
gstplugin.c	camerabin2: don't mess with camerabin (1) namespace	2011-07-08 00:11:37 -07:00
gstviewfinderbin.c	Merge remote-tracking branch 'origin/master' into 0.11-premerge	2011-12-30 11:41:17 +01:00
gstviewfinderbin.h	camerabin2: viewfinderbin: Add property for disabling converters	2011-08-23 11:19:51 -03:00
gstwrappercamerabinsrc.c	Merge remote-tracking branch 'origin/master' into 0.11-premerge	2011-12-30 11:41:17 +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