Delphi-OpenCV/samples/Components/cFFmpegIPCamSource
Laentir Valetov c6c91c75c6 Merge branch 'master' of github.com:Laex/Delphi-OpenCV
Conflicts:
	samples/Components/cCameraCapture/cCameraCapture.res
	samples/Components/cCameraCapture/uMainForm.dfm
	samples/Components/cFFmpegIPCamSource/cFFmpegIPCamSource.res
	source/component/Delphi20/dclOpenCV200.res
2014-05-23 22:23:12 +04:00
..
cFFmpegIPCamSource.dpr FFMpeg IPCam Source 2014-05-23 00:31:51 +04:00
cFFmpegIPCamSource.dproj Fixed cCameraCapture and cFFmpegIPCamSource 2014-05-23 13:34:11 +06:00
cFFmpegIPCamSource.res TovcAddWeightedOperation 2014-05-23 22:16:07 +04:00
uMainForm.dfm TovcAddWeightedOperation 2014-05-23 22:16:07 +04:00
uMainForm.pas TovcAddWeightedOperation 2014-05-23 22:16:07 +04:00