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 |
|
Laentir Valetov
|
c3cec1a5e3
|
TovcAddWeightedOperation
Signed-off-by: Laentir Valetov <laex@bk.ru>
|
2014-05-23 22:16:07 +04:00 |
|
Mikhail Grigorev
|
a31da67e0c
|
Fixed cCameraCapture and cFFmpegIPCamSource
Signed-off-by: Mikhail Grigorev <sleuthhound@gmail.com>
|
2014-05-23 13:34:11 +06:00 |
|
Laentir Valetov
|
d3ab24126a
|
Refactoring
Signed-off-by: Laentir Valetov <laex@bk.ru>
|
2014-05-23 11:02:53 +04:00 |
|
Laentir Valetov
|
e74ee8bbe5
|
FFMpeg IPCam Source
Signed-off-by: Laentir Valetov <laex@bk.ru>
|
2014-05-23 00:31:51 +04:00 |
|