Edward Hervey f70a623418 Merge remote-tracking branch 'origin/master' into 0.11-premerge ... Conflicts: docs/libs/Makefile.am ext/kate/gstkatetiger.c ext/opus/gstopusdec.c ext/xvid/gstxvidenc.c gst-libs/gst/basecamerabinsrc/Makefile.am gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h gst-libs/gst/video/gstbasevideocodec.c gst-libs/gst/video/gstbasevideocodec.h gst-libs/gst/video/gstbasevideodecoder.c gst-libs/gst/video/gstbasevideoencoder.c gst/asfmux/gstasfmux.c gst/audiovisualizers/gstwavescope.c gst/camerabin2/gstcamerabin2.c gst/debugutils/gstcompare.c gst/frei0r/gstfrei0rmixer.c gst/mpegpsmux/mpegpsmux.c gst/mpegtsmux/mpegtsmux.c gst/mxf/mxfmux.c gst/videomeasure/gstvideomeasure_ssim.c gst/videoparsers/gsth264parse.c gst/videoparsers/gstmpeg4videoparse.c		2011-12-30 11:41:17 +01:00
..
gstbasecamerasrc.c	Merge remote-tracking branch 'origin/master' into 0.11-premerge	2011-12-30 11:41:17 +01:00
gstbasecamerasrc.h	basecamerabinsrc: remove redundant functions	2011-12-22 16:17:56 -03:00
gstcamerabin-enum.c	camerabin2: Move basecamerasrc to gst-libs	2010-12-23 13:20:31 -03:00
gstcamerabin-enum.h	basecamerasrc: add unstable-API warnings if GST_USE_UNSTABLE_API is not defined	2011-04-14 16:14:57 +01:00
gstcamerabinpreview.c	camerabin: use GstSample for the preview	2011-12-01 16:59:14 +01:00
gstcamerabinpreview.h	basecamerasrc: optimize state changing speed	2011-10-31 07:14:36 -03:00
Makefile.am	basecamerabinsrc: remove redundant functions	2011-12-22 16:17:56 -03:00