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
..
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 branch 'master' into 0.11	2012-02-10 16:46:50 +01:00
gstcamerabin2.h	port to new gthread API	2012-01-19 11:34:26 +01: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 branch 'master' into 0.11	2012-02-10 16:46:50 +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