- 19 Apr, 2015 2 commits
-
-
Vicente Olivert Riera authored
superres module fails to compile with the following error messages: [100%] Building CXX object modules/superres/CMakeFiles/opencv_superres.dir/src/super_resolution.cpp.o /opencv-2.4.10/modules/superres/src/frame_source.cpp: In function 'cv::Ptr<cv::superres::FrameSource> cv::superres::createFrameSource_Video_GPU(const string&)': /opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected type-specifier before 'VideoFrameSource' /opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: could not convert '(int*)operator new(4ul)' from 'int*' to 'cv::Ptr<cv::superres::FrameSource>' /opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected ';' before 'VideoFrameSource' /opencv-2.4.10/modules/superres/src/frame_source.cpp:263:41: error: 'VideoFrameSource' was not declared in this scope /opencv-2.4.10/modules/superres/src/frame_source.cpp:264:1: error: control reaches end of non-void function [-Werror=return-type] cc1plus: some warnings being treated as errors make[3]: *** [modules/superres/CMakeFiles/opencv_superres.dir/src/frame_source.cpp.o] Error 1 make[3]: *** Waiting for unfinished jobs.... This is caused because the return value of the createFrameSource_Video_GPU function should be a VideoFrameSource_GPU object. (cherry picked from commit 2e393ab8)
-
Vladislav Vinogradov authored
Install symlinks to shared libraries as a part of development package, not runtime package. It is default behavior for debian packages. (cherry picked from commit f55c1cc0)
-
- 05 Nov, 2014 1 commit
-
-
Alexander Smorkalov authored
-
- 04 Nov, 2014 3 commits
-
-
Vladislav Vinogradov authored
(cherry picked from commit 84f33d05)
-
Vladislav Vinogradov authored
(cherry picked from commit 5c07e0b6)
-
Vladislav Vinogradov authored
(cherry picked from commit e0827069)
-
- 01 Oct, 2014 5 commits
-
-
Andrey Pavlenko authored
-
Andrey Pavlenko authored
-
Andrey Pavlenko authored
-
Andrey Pavlenko authored
-
Alexander Smorkalov authored
-
- 30 Sep, 2014 10 commits
-
-
Roman Donchenko authored
-
Roman Donchenko authored
-
Roman Donchenko authored
-
Alexander Smorkalov authored
-
Maksim Shabunin authored
-
Alexander Smorkalov authored
-
StevenPuttemans authored
-
Alexander Smorkalov authored
-
Alexander Smorkalov authored
-
Alexander Smorkalov authored
-
- 29 Sep, 2014 5 commits
-
-
Artur Wieczorek authored
Use _com_ptr_t instead of CComPtr in ComPtr wrapper to avoid ATL dependency.
-
Alexander Smorkalov authored
-
Roman Donchenko authored
-
Alexander Smorkalov authored
-
Maksim Shabunin authored
-
- 27 Sep, 2014 2 commits
-
-
Vadim Pisarevsky authored
-
Vadim Pisarevsky authored
-
- 26 Sep, 2014 1 commit
-
-
Manfred Georg authored
The Mutex manager registered with ffmpeg must reset the mutex to NULL after destruction, otherwise ffmpeg will give the invalid mutex to the next mutex manager when it asks it to CREATE a new mutex. See ffmpeg code: http://git.videolan.org/?p=ffmpeg.git;a=blob;f=libavcodec/utils.c;h=28c5785398fcf11a3d3c70a8cd09e9df798e2734;hb=HEAD#l3423 Cherry picked from head (file has moved but issue is the same). Conflicts: modules/videoio/src/cap_ffmpeg_impl.hpp
-
- 25 Sep, 2014 1 commit
-
-
Maksim Shabunin authored
-
- 24 Sep, 2014 4 commits
-
-
Vadim Pisarevsky authored
-
Vadim Pisarevsky authored
-
StevenPuttemans authored
-
Artur Wieczorek authored
-
- 23 Sep, 2014 6 commits
-
-
Artur Wieczorek authored
Currently, FFMPEG source files are included in highgui project file regardless of CMake WITH_FFMPEG option. After applying this PR FFMPEG files are included only if WITH_FFMPEG option is enabled.
-
Artur Wieczorek authored
-
Vadim Pisarevsky authored
-
Vadim Pisarevsky authored
-
Vadim Pisarevsky authored
-