Roman Donchenko
|
2c4bbb313c
|
Merge commit '43aec5ad' into merge-2.4
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
|
2013-08-27 13:26:44 +04:00 |
|
Roman Donchenko
|
e9a28f66ee
|
Normalized file endings.
|
2013-08-21 18:59:25 +04:00 |
|
Vladislav Vinogradov
|
60e2dbe810
|
removed ffmpeg dependency from gpucodec module:
used implementation from highgui module
|
2013-07-26 16:13:37 +04:00 |
|
OpenCV Buildbot
|
81f826db2b
|
Normalize line endings and whitespace
|
2012-10-17 15:57:49 +04:00 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04:00 |
|
Vladislav Vinogradov
|
f4b4665940
|
added VideoReader_GPU
|
2012-04-18 11:18:25 +00:00 |
|
Vladislav Vinogradov
|
70909738f4
|
added support of different surface formats to VideoWriter_GPU
added key frame handling to ffmpeg wrappers
|
2012-04-17 11:08:08 +00:00 |
|
Vladislav Vinogradov
|
2bfaf540a1
|
added VideoWriter_GPU
|
2012-04-17 07:12:16 +00:00 |
|
Alexander Reshetnikov
|
e0b772a392
|
Added a first version of new ffmpeg wrapper
|
2012-03-12 17:07:54 +00:00 |
|
Andrey Morozov
|
bba4f9e5d6
|
removed property. added automatically define number of cpus for decoding video
|
2011-08-02 14:27:21 +00:00 |
|
Andrey Morozov
|
d87a56a639
|
added support new ffmpeg (0.8.X)
|
2011-07-29 14:17:42 +00:00 |
|
Vadim Pisarevsky
|
b33224f0b6
|
merged the latest fixes in 2.3 to trunk
|
2011-07-04 16:18:12 +00:00 |
|