Andrey Kamaev
|
f4e27bcbbc
|
Merge branch '2.4'
|
2013-01-25 16:30:36 +04:00 |
|
Andrey Kamaev
|
e3474878b6
|
Consistently use 4-digit library version
|
2013-01-18 14:57:55 +04:00 |
|
marina.kolpakova
|
e53d57664d
|
fix precompiled headers usage in gpu module
|
2012-12-30 16:58:41 +04:00 |
|
Vladislav Vinogradov
|
2f1ca1b6b3
|
fixed build for CARMA:
* added CMake toolchain file
* added WITH_NVCUVID flag
|
2012-12-21 13:45:50 +04:00 |
|
vlad
|
11293d071f
|
Revert "disabled video decoding under linux"
This reverts commit 889674ef43fb8d2a35883ae31895b34a58089007.
|
2012-12-21 12:54:38 +04:00 |
|
Vladislav Vinogradov
|
889674ef43
|
disabled video decoding under linux
|
2012-12-13 13:48:24 +04:00 |
|
Vladislav Vinogradov
|
bff818afbd
|
fixed static build of gpu module with ffmpeg:
multiple definition of cap_ffmpeg_impl.hpp functions in gpu and highgui
|
2012-11-08 15:49:56 +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
|
2dafc9a853
|
fixed build under MacOS (disabled video decoding, it's not supported)
|
2012-05-11 11:48:15 +00:00 |
|
Vladislav Vinogradov
|
c65b7a9980
|
removed #include "cap_ffmpeg_impl_v2.hpp"
|
2012-05-03 08:34:14 +00:00 |
|
Vladislav Vinogradov
|
77717e1abc
|
fixed opencv_ffmpeg.dll name in gpu video encoding/decoding
|
2012-05-02 13:23:11 +00:00 |
|
Vladislav Vinogradov
|
f4b4665940
|
added VideoReader_GPU
|
2012-04-18 11:18:25 +00:00 |
|