mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 05:29:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,014 Commits 6 Branches 126 Tags 3 GiB
73b10bc8ca
Commit Graph

6200 Commits

Author SHA1 Message Date
Dominik Rose
e32700cf8f dc1394-2: support for operation mode 1394b added 2013-06-27 15:05:32 +02:00
Roman Donchenko
d76468c223 Merge pull request #1040 from asmorkalov:winrt 2013-06-27 16:59:25 +04:00
Alexander Smorkalov
7c5bd78804 Test fixes 
Calib3d badarg tests fixed. Default exception handling enabled;
Highgui Video I/O tests fixed on ARM;
Code cleanup.
 2013-06-27 15:47:37 +04:00
Roman Donchenko
4f19216e45 Merge pull request #1036 from jet47:fix-gpu-deviceinfo 2013-06-27 15:37:42 +04:00
Roman Donchenko
664b720e4d Extended Google Test to allow filtering by parameter value. 2013-06-27 13:14:37 +04:00
Roman Donchenko
f477696cc5 Merge pull request #1050 from pengx17:2.4_clach_mod 2013-06-27 12:22:01 +04:00
Alexander Smorkalov
e241c14b94 OpenCV Library and Manager version incremented. 
OpenCV Version 2.4.6;
OpenCV Manager Version 2.8;
Doc fixes.
 2013-06-27 12:05:25 +04:00
Roman Donchenko
c1f8d9e3d2 Merge pull request #1011 from wecacuee:master 2013-06-27 12:03:07 +04:00
peng xiao
b2da1cdcc2 Temporarily disable command queue release as it causes program hang at exit 2013-06-27 10:20:21 +08:00
peng xiao
fc64faa22e Remove empty cv::ocl::CLAHE class. 2013-06-27 10:06:37 +08:00
peng xiao
dcc4766129 Fix white-spacing 2013-06-27 09:57:42 +08:00
Vikas Dhiman
f15dc72b89 Removed misleading comment and added the divisibility test to ::run function. 2013-06-26 12:16:25 -04:00
Roman Donchenko
76efc9853a Merge pull request #1053 from snosov1:unreliable-results-fix 2013-06-26 17:00:15 +04:00
Roman Donchenko
bf6b119a3f Merge pull request #1045 from bitwangyaoyao:2.4_fix 2013-06-26 16:55:06 +04:00
Roman Donchenko
1cfe5aa41e Merge pull request #1048 from SpecLad:xls-conf 2013-06-26 16:53:50 +04:00
Alexander Smorkalov
347c86d9b5 Windows RT related code cleanup. 
Windows RT sample cleanup.
Video I/O code cleanup.
 2013-06-26 05:44:10 -07:00
Roman Donchenko
53afdb4b30 Merge pull request #1041 from abidrahmank:master 2013-06-26 16:38:54 +04:00
Roman Donchenko
a335fc591f Merge pull request #1052 from SpecLad:ocl-mingw-warnings 2013-06-26 16:13:47 +04:00
Sergei Nosov
29955620e0 multiruns added to avoid the 'unreliable results' error 2013-06-26 15:07:39 +04:00
Roman Donchenko
5b2b76763e Fix miscellaneous warnings from compiling with MinGW. 
Note that MinGW defines NOMINMAX by default.
 2013-06-26 14:59:00 +04:00
peng xiao
9270205947 Fix build errors 2013-06-26 17:24:09 +08:00
yao
2ec1140b25 fix pyrlk 2013-06-26 16:58:20 +08:00
peng xiao
132b885b24 Add opencl implementation of Farnback optical flow. 2013-06-26 16:35:19 +08:00
peng xiao
cc3fb3d182 Let CLAHE_OCL reuse cv::CLAHE abstract class. 2013-06-26 10:50:51 +08:00
Vladislav Vinogradov
3c32fc1329 removed obsolete methods from gpu::Stream 2013-06-25 17:45:23 +04:00
Roman Donchenko
f36f8067bc Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/calib3d/include/opencv2/calib3d/calib3d.hpp
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/cuda/limits.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/matrix.cpp
	modules/nonfree/test/test_features2d.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/hog.cpp
	modules/ocl/test/test_haar.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/test_pyrup.cpp
	modules/ts/src/precomp.hpp
	samples/ocl/facedetect.cpp
	samples/ocl/hog.cpp
	samples/ocl/pyrlk_optical_flow.cpp
	samples/ocl/surf_matcher.cpp
 2013-06-25 15:55:52 +04:00
Roman Donchenko
1dccf5743e Merge pull request #1024 from jet47:fix-gpuarithm-compilation 2013-06-25 14:38:18 +04:00
Alexander Smorkalov
ee591efb9f Build fix for Windows RT. 2013-06-25 03:35:58 -07:00
Alexander Smorkalov
34c6598752 Perf test failure fixes for Media Foundation. 2013-06-25 03:35:57 -07:00
Alexander Smorkalov
2bc1d3709c GetProperty method for MSMF VideoCapture implemented. 2013-06-25 03:35:56 -07:00
Alexander Smorkalov
43122939cb Media foundation video i/o fixes. 
Bug in Video for Windows capture init fixed;
Media Foundation based capture finalization fixed;
Highgui tests for video i/o updated.
 2013-06-25 03:35:30 -07:00
yao
1227e00f3d fix moments 2013-06-25 16:26:33 +08:00
Roman Donchenko
381057eaad Merge pull request #1002 from asmorkalov:doc_warning_fix 2013-06-25 11:42:00 +04:00
Roman Donchenko
f8e187e1e1 Merge pull request #1035 from SpecLad:cv-concurrency 2013-06-25 11:33:16 +04:00
yao
dbdeff2069 fix stereobm crash on some cpu ocl 2013-06-25 14:12:02 +08:00
yao
6db776f957 add "-c" for cpu ocl mode in perf tests 2013-06-25 14:11:28 +08:00
Roman Donchenko
c244f000ab Merge pull request #1030 from SpecLad:ts-impl-variants 2013-06-24 18:28:13 +04:00
Roman Donchenko
961251f0ca Merge pull request #1029 from SpecLad:have-qt-config 2013-06-24 17:03:51 +04:00
abidrahmank
a1ea1a7ec5 boxpoints documentation 2013-06-24 16:17:23 +05:30
abidrahmank
bcf9117957 Added missing python functions in highgui documentation 
setMouseCallback
createTrackbar
 2013-06-24 15:53:45 +05:30
Alexander Smorkalov
996f02a531 Multiple Media Foundation video i/o fixes. 
Video i/o tests enabled for media foundation;
Negative stride support added to VideoCapture;
Error handling improved, dead lock in case of playback error fixed;
Some code refacotring done.
 2013-06-24 02:45:27 -07:00
Alexander Smorkalov
0c9d776083 Media Foundation-based code refactoring. 
I* + SafeRelease -> ComPtr.
 2013-06-24 02:45:26 -07:00
Alexander Smorkalov
e94cc0b5ee Media Foundation camera capture fixed. 
Camera-based VideoCapture updated to fit changes in ImageGrabber from prev
commit
 2013-06-24 02:45:25 -07:00
Alexander Smorkalov
9fb762ccec VideoCapture for video files implemented. 
Set and Get methods are not implemented;
Camera based video capture is broken due to modifications.
 2013-06-24 02:45:24 -07:00
Alexander Smorkalov
22b0cfbaa2 Media Foundation-based VideoWriter improvements. 
FourCC parameter handlig added;
Smart pointers instead SafeRelease call;
Windows RT support (vertical mirroring).
 2013-06-24 02:45:23 -07:00
Alexander Smorkalov
ccb8292e8e Media Foundation-based VideoWriter added 2013-06-24 02:45:22 -07:00
Alexander Smorkalov
033e3092a3 Media Foundation based VideoCapture improved 
Code formating fixed;
GrabFrame method implemented correclty.
 2013-06-24 02:45:21 -07:00
Roman Donchenko
3bab7391d0 Merge pull request #1028 from SpecLad:ocl-clahe-dtor 2013-06-24 13:18:28 +04:00
Roman Donchenko
c16316c4b4 Replaced the semi-public CV_PARALLEL_FRAMEWORK macro with a function. 
That way, core/internal.hpp doesn't have to depend on cvconfig.h, which we
don't ship.
 2013-06-24 12:57:14 +04:00
Roman Donchenko
171a56fe82 Merge pull request #1034 from pengx17:2.4_oclmat_inoutarray 2013-06-24 12:27:26 +04:00
Roman Donchenko
7cb047e2d9 Merge pull request #1031 from pengx17:2.4_fix_converTo 2013-06-24 12:25:48 +04:00
Roman Donchenko
4ed3d33dd7 Merge pull request #1025 from bitwangyaoyao:2.4_tests 2013-06-24 12:11:04 +04:00
Roman Donchenko
b0421cafab Merge pull request #1022 from bitwangyaoyao:2.4_hog 2013-06-24 12:08:59 +04:00
abidrahmank
37f4e400e4 Added cv2.boxPoints() functionality to Python bindings (Feature #2023) 
http://www.code.opencv.org/issues/2023

eg:

In [3]: box = ((10,10),(5,5),0)

In [4]: cv2.boxPoints(box)
Out[4]:
array([[  7.5,  12.5],
       [  7.5,   7.5],
       [ 12.5,   7.5],
       [ 12.5,  12.5]], dtype=float32)
 2013-06-24 12:13:59 +05:30
Vladislav Vinogradov
98bd401534 fix gpu::DeviceInfo compilation under linux 
glibc defines major and minor macros
which conflict with  gpu::DeviceInfo methods with the same name
 2013-06-24 10:11:44 +04:00
Roman Donchenko
5fa200763f Merge pull request #1026 from SpecLad:ts-version-prop 2013-06-21 18:00:59 +04:00
Roman Donchenko
eff6dccb3b Merge pull request #1014 from jet47:gpustereo-refactoring 2013-06-21 17:38:36 +04:00
Roman Donchenko
b20c9ad2d1 Merge pull request #1015 from SpecLad:merge-2.4 2013-06-21 17:38:04 +04:00
Roman Donchenko
e3ae36dcb3 Merge pull request #1033 from SpecLad:xls++ 2013-06-21 17:13:33 +04:00
Roman Donchenko
d4a8b87645 Wrote relevant docs. 2013-06-21 16:45:17 +04:00
Roman Donchenko
84639e444b Merge pull request #1010 from jet47:gpufilters-refactoring 2013-06-21 14:45:50 +04:00
Roman Donchenko
0e3a9eaf98 Made Collector render property sets as dicts instead of tuples of pairs. 2013-06-21 13:43:16 +04:00
peng xiao
290c8db0a8 Revise naming for getOclMat function. 2013-06-21 14:51:23 +08:00
peng xiao
e129638263 Add a workaround to interpolate between oclMat and Input/OutputArray. 2013-06-21 14:05:29 +08:00
Roman Donchenko
2688e22cb5 Made xls-report.py use global properties in XML files. 
Now it can determine, without looking at the file name, both the module
name and the configuration name (the latter with a little help from the
configuration file).
 2013-06-20 19:57:45 +04:00
Roman Donchenko
57317c3196 Use log formatting as intended. 2013-06-20 19:39:02 +04:00
Roman Donchenko
3ea4836a0a Changed the impls argument to be an array name. 
Turns out, you can't use preprocessor directives inside macro arguments.
Who'd have thought?
 2013-06-20 15:18:35 +04:00
Roman Donchenko
3e2c456313 A few minor improvements to the XLS report generator. 
* In comparison column headers, switched the order of labels, so that
  it's "to" vs "from".

* When a test was present, but not run successfully, put its status in
  the corresponding cell instead of coloring it gray.
 2013-06-20 14:38:01 +04:00
Roman Donchenko
e600beb484 Merge pull request #1017 from jet47:fix-gpu-warnings 2013-06-20 12:13:14 +04:00
Vladislav Vinogradov
f08d75a84b removed obsolete API 2013-06-20 11:24:29 +04:00
peng xiao
c1f4fe1637 Fix a bug of convertTo. 
The bug was found that all 3-channel oclMat's were converted to
4-channel oclMat's after using convertTo function.
 2013-06-20 11:26:22 +08:00
Roman Donchenko
51a672ec40 Disabled the cuda variant when CUDA is not available. 2013-06-19 19:16:18 +04:00
Roman Donchenko
7a104d2793 Added an option to print available implementation variants. 2013-06-19 18:47:15 +04:00
Roman Donchenko
b581f27249 Made perf tests record module name, selected implementation and number of threads. 2013-06-19 17:55:42 +04:00
Roman Donchenko
936236e4b1 Extended the CPU/GPU selection mechanism in performance tests. 
Now it allows choosing between arbitrary implementation variants.
 2013-06-19 17:55:42 +04:00
Roman Donchenko
37d19b9c46 Pass the HAVE_QT* flags through the config header, like all others. 
I don't know why it didn't work for the original author, but it definitely
works now.
 2013-06-19 17:44:12 +04:00
Roman Donchenko
1d9660c6d2 Merge pull request #954 from LeszekSwirski:24_fix-qtwindow 2013-06-19 17:01:57 +04:00
Roman Donchenko
1ed5fb937d Give cv::ocl::CLAHE a virtual destructor, for the usual reasons. 2013-06-19 15:39:11 +04:00
Vladislav Vinogradov
50166d2734 fixed compilation with CUDA 4.2 2013-06-19 15:29:20 +04:00
Roman Donchenko
13cd0a0502 Merge remote-tracking branch 'origin/2.4' 
Original pull requests:
	#996 from jet47:gpu-nvcuvid-libraries
	#995 from jet47:fix-bug-2985
	#999 from snosov1:unreliable-results-fix
	#1005 from alekcac:doc_fix
	#1004 from jet47:fix-bug-3068
	#987 from jet47:bug-3085-fix
	#969 from pengx17:2.4_binary_cache
	#929 from dominikrose:mingw-libdc1394-2-windows
	#1000 from ivan-korolev:fix_sift_bug_2892
	#1001 from ivan-korolev:fix_stitching_bug_2405
	#998 from asmorkalov:android_cmake_mips_fix
	#993 from ivan-korolev:fix_videostab_bug_3023
	#988 from snosov1:3071-fix
	#986 from pengx17:2.4_initiated_context
	#982 from pengx17:2.4_fix_two_bugs
	#981 from SeninAndrew:ximea_camera_support_fix
	#991 from asmorkalov:android_javadoc_fix
	#972 from jet47:mog2-params-bug-2168
	#980 from SpecLad:include-config
	#973 from pengx17:2.4_oclclahe
	#903 from aks2:2.4
	#968 from asmorkalov:android_na_cproj_fix
	#971 from SpecLad:matchers-ctor
	#970 from asmorkalov:dshow_valid_check_fix
	#965 from apavlenko:fix_java_empty_mats

Conflicts:
	cmake/OpenCVModule.cmake
	modules/core/src/matmul.cpp
	modules/gpu/CMakeLists.txt
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/stitching/src/matchers.cpp
	modules/video/src/video_init.cpp
	modules/videostab/src/global_motion.cpp
 2013-06-19 15:25:37 +04:00
Roman Donchenko
d58421c08e Make version-related test properties more useful. 
Namely, normalize their names to a common convention and remove useless text
from their values.
 2013-06-19 14:45:03 +04:00
Roman Donchenko
fa158304fe Merge pull request #1016 from SpecLad:xls-report 2013-06-19 12:24:34 +04:00
Roman Donchenko
dd23a3c227 Merge pull request #1020 from SpecLad:tests-record-more 2013-06-19 12:24:05 +04:00
Vladislav Vinogradov
4b983679a5 fix gpuarithm module compilation (Bug #3103) 2013-06-19 10:13:33 +04:00
yao
2c198f6cd6 revise accuracy and perf tests 2013-06-19 13:03:35 +08:00
yao
26c246140a optimize hog 2013-06-19 11:20:45 +08:00
Roman Donchenko
25613fbfd7 Merge pull request #1008 from ivan-korolev:fix_sift_bug_2892 2013-06-18 18:32:03 +04:00
Roman Donchenko
4af7d65224 Made tests record information about CPU features and Tegra optimization status. 2013-06-18 18:26:53 +04:00
Roman Donchenko
24d84a45b1 Made tests record in the XML output which parallel framework was used. 2013-06-18 18:26:53 +04:00
Vladislav Vinogradov
371a9cd833 fixed build with CUDA 5.5 on arm platforms 2013-06-18 17:46:57 +04:00
Vladislav Vinogradov
1492b20472 fix gpu warnings with signed/unsigned char 2013-06-18 17:44:49 +04:00
Alexander Smorkalov
8f7ba03ed2 Some fixes for incorrectly documented parameters identified by rst_parser.py (Bug #1205) 2013-06-18 16:48:24 +04:00
Roman Donchenko
748210e11b Merge pull request #994 from asmorkalov:android_java_wrappers 2013-06-18 16:46:04 +04:00
Alexander Smorkalov
16c4aad36d Java/Python bindings for computeCorrespondEpilines added. 
Simle Java test for computeCorrespondEpilines added.
 2013-06-18 16:44:23 +04:00
Roman Donchenko
5b39c02c39 Merge pull request #1007 from alekcac:i_camera 2013-06-18 15:54:01 +04:00
Roman Donchenko
584f0745d0 Made xls-report.py ignore tests that were not successful. 2013-06-18 13:41:41 +04:00
Roman Donchenko
0f1156bbb6 Made the order of tests in XLS reports deterministic. 2013-06-18 13:37:40 +04:00
Roman Donchenko
4d7b1b5ede In the XLS report, enabled word wrapping for header cells. 
Otherwise, Excel ignores line breaks in them.
 2013-06-18 12:31:43 +04:00
Roman Donchenko
6ff207b53a Added a new and improved version of the XLS report generator. 2013-06-18 12:31:43 +04:00
Roman Donchenko
f003e29dc0 Updated testlog_parser.py to the latest version from the private repo. 2013-06-18 12:31:43 +04:00
Vladislav Vinogradov
4e29f0ee6d updated documentation 2013-06-18 08:36:49 +04:00
Alexander Shishkov
24fd2cc326 updated licenses 2013-06-18 07:02:09 +04:00
Alexander Shishkov
5db08961ce fixed Kirill's comments 2013-06-18 06:59:52 +04:00
Vladislav Vinogradov
24108f8110 updated documentation 2013-06-17 09:53:39 +04:00
Andrey Pavlenko
01e9733155 fix for #3077 
removing "-fvisibility=hidden" gcc option due to lack of `__attribute__ ((visibility("default")))` in jni_md.h/JNIEXPORT
 2013-06-14 20:25:23 +04:00
Vikas Dhiman
dbc9b4db0c support elementwise division for Matx with "/" operator. 2013-06-14 11:38:29 -04:00
Vladislav Vinogradov
a380c473b9 switched to Input/Output Array in reprojectImageTo3D & drawColorDisp 2013-06-14 18:17:31 +04:00
Vladislav Vinogradov
3a02e599e0 refactored DisparityBilateralFilter 2013-06-14 18:17:31 +04:00
Vladislav Vinogradov
be9bb8f18b refactored StereoConstantSpaceBP 2013-06-14 18:17:31 +04:00
Vladislav Vinogradov
d0e89337da refactored StereoBeliefPropagation 2013-06-14 18:17:31 +04:00
Vladislav Vinogradov
dd6d58f873 refactored StereoBM 2013-06-14 18:17:30 +04:00
Vladislav Vinogradov
4317cd1ffa refactored 1D Sum Filters 2013-06-14 17:25:57 +04:00
Vladislav Vinogradov
4bb297afc2 refactored Image Rank Filters 2013-06-14 17:25:57 +04:00
Vladislav Vinogradov
5720eaf354 refactored Morphology Filters 2013-06-14 17:25:57 +04:00
Vladislav Vinogradov
12ae11e2ff refactored Separable Linear Filters 2013-06-14 17:25:56 +04:00
Vladislav Vinogradov
ee7eb1b807 refactored Laplacian filter 2013-06-14 17:25:56 +04:00
Vladislav Vinogradov
1eedc6c42a refactored Linear Filter 2013-06-14 17:25:56 +04:00
Vladislav Vinogradov
fcfcd4cbce refactored box filter 2013-06-14 17:25:56 +04:00
Ivan Korolev
fee8121040 Added regression tests for SURF/SIFT (related to #2892) 2013-06-14 17:08:01 +04:00
Roman Donchenko
71db862dc2 Merge pull request #977 from jet47:gpucodec-refactoring 2013-06-14 16:24:24 +04:00
Roman Donchenko
2fc49ac564 Merge pull request #978 from jet47:gpuarithm-refactoring 2013-06-14 16:24:03 +04:00
Roman Donchenko
843094a07f Merge pull request #996 from jet47:gpu-nvcuvid-libraries 2013-06-14 16:23:02 +04:00
Roman Donchenko
918f37542b Merge pull request #999 from snosov1:unreliable-results-fix 2013-06-14 16:19:50 +04:00
Roman Donchenko
c4974a2511 Merge pull request #1004 from jet47:fix-bug-3068 2013-06-14 15:52:56 +04:00
Roman Donchenko
4bc4f4aa1f Merge pull request #1003 from vhdirk:gstreamerfixes 2013-06-14 15:51:03 +04:00
Roman Donchenko
fbc6814023 Merge pull request #987 from jet47:bug-3085-fix 2013-06-14 15:49:33 +04:00
Roman Donchenko
d998e38a12 Merge pull request #983 from HapeMask:python3-compatibility 2013-06-14 15:48:37 +04:00
Roman Donchenko
47ea0614dc Merge pull request #969 from pengx17:2.4_binary_cache 2013-06-14 15:47:23 +04:00
Roman Donchenko
0124902f42 Merge pull request #929 from dominikrose:mingw-libdc1394-2-windows 2013-06-14 15:46:25 +04:00
Alexander Shishkov
0cee15eb7f Updated iOS camera. Added rotation flag. Added functions to lock/unlock focus, white balance and exposure. 2013-06-14 15:10:25 +04:00
Roman Donchenko
308c7f5f6e Merge pull request #1000 from ivan-korolev:fix_sift_bug_2892 2013-06-14 13:50:01 +04:00
Vladislav Vinogradov
a4750f49c6 fix for bug #3068 (PCA::computeVar for double input): 
The matrix g  can have CV_32F or CV_64F type,  but g.at uses only float template.
This fix adds specialization for double type.
 2013-06-14 12:53:44 +04:00
peng xiao
e6b18fc492 Fix a bug caused by NDEBUG macro; it is now removed. 
Revise some descriptions of the enums.
 2013-06-14 16:37:00 +08:00
Roman Donchenko
130794d41c Merge pull request #990 from asmorkalov:pthread_build_fix 2013-06-14 11:48:05 +04:00
Roman Donchenko
83fa4d38a4 Merge pull request #976 from PeterMinin:num_detections 2013-06-14 11:24:00 +04:00
Ivan Korolev
58fa401b4d Fixed a bug #2405 2013-06-14 10:43:20 +04:00
Ivan Korolev
fc82150edc Fixed a bug #2892 2013-06-14 08:21:42 +04:00
Peter Minin
7d70399d72 Add a new variant of detectMultiScale with output arguments 'objects' and 'numDetections'; factor most of detectMultiScale's code into 2 protected methods 2013-06-14 04:25:17 +04:00
Gabe Schwartz
bb209193c9 Updated usage of METH_X definitions for python 3. 
Python 3 requires METH_VARARGS | METH_KEYWORDS, not just METH_KEYWORDS.
 2013-06-13 20:10:01 -04:00
Gabe Schwartz
bce1b352e7 Updated cmake files to use print(). 
In these cases, just using print() is enough to ensure py2/3
compatibility.
 2013-06-13 20:10:01 -04:00
Gabe Schwartz
fb9781b97b Updated cv2.cpp to support Python 3 API. 
Added a header with defines to enable the module to compile with either
python 2 or 3 without changes.
 2013-06-13 20:10:01 -04:00
Gabe Schwartz
931ebab822 Updated generator and parser to support Python 3. 2013-06-13 18:39:47 -04:00
Sergei Nosov
c90abb6a03 add multiruns to fix "unreliable results" error 2013-06-13 21:14:42 +04:00
Roman Donchenko
8fa1e756e2 Merge pull request #993 from ivan-korolev:fix_videostab_bug_3023 2013-06-13 16:57:12 +04:00
Roman Donchenko
b725cbf73f Merge pull request #986 from pengx17:2.4_initiated_context 2013-06-13 16:55:56 +04:00
Roman Donchenko
5bb6d36684 Merge pull request #982 from pengx17:2.4_fix_two_bugs 2013-06-13 16:55:12 +04:00
Roman Donchenko
462047d1e4 Merge pull request #981 from SeninAndrew:ximea_camera_support_fix 2013-06-13 16:54:45 +04:00
Vladislav Vinogradov
0367a7f992 link with nvcuvenc and ffmpeg libraries only if WITH_NVCUVID is enabled 2013-06-13 16:46:34 +04:00
Alexander Smorkalov
37b67fa50d Fix compiler error due to missing pthread header (Issue #2953) 2013-06-13 16:11:39 +04:00
Ivan Korolev
de4c3f0178 Fixed a bug related to video stabilization crashes with a blank video (Bug #3023) 2013-06-13 13:41:43 +04:00