Andrey Pavlenko
7018f94959
Merge pull request #3288 from StevenPuttemans:fix_ts_dependencies
10 years ago
Andrey Pavlenko
533fde66e3
Merge pull request #3281 from a-wi:MSMF_remove_ATL_dependency
10 years ago
Andrey Pavlenko
5bd18155be
Merge pull request #3290 from asmorkalov:android_disable_fisheye.rectify_for_tegra
10 years ago
Andrey Pavlenko
aa6b5ac124
Merge pull request #3291 from asmorkalov:android_superres_video_check
10 years ago
Alexander Smorkalov
ca40a749b6
Turn off superres accuracy tests if video i/o is not supported.
10 years ago
Roman Donchenko
d54d580f79
Merge pull request #3275 from asmorkalov:ocv_gstreamer_backport
10 years ago
Roman Donchenko
774d6c1d0a
Merge pull request #3285 from asmorkalov:android_servive_big.little_fix
10 years ago
Roman Donchenko
302d80d744
Merge pull request #3287 from asmorkalov:android_manager_version_inc5
10 years ago
Alexander Smorkalov
286c6b496d
OpenCV Manager hardware detector workaround for not detected ARM SoC support.
10 years ago
Maksim Shabunin
44da1f795f
Merge pull request #3282 from asmorkalov:android_exclude_ocl
10 years ago
Alexander Smorkalov
71c4e96e17
Test fisheye.rectify disabled for Tegra.
10 years ago
StevenPuttemans
60fd5c2a3a
fixing dependencies
10 years ago
Alexander Smorkalov
8271c4e9c4
Highgui_Video.prop_fps disabled as fails with FFmpeg in Ubuntu 14.04.
10 years ago
Alexander Smorkalov
1f4fe3bb27
GStreamer 1.0 backport from master branch.
10 years ago
Alexander Smorkalov
a0431acb37
OpenCV Manager version++.
10 years ago
Artur Wieczorek
e3f1d722e7
Remove ATL dependency from MSMF capture code
...
Use _com_ptr_t instead of CComPtr in ComPtr wrapper to avoid ATL dependency.
10 years ago
Alexander Smorkalov
1c3c94fd2c
Exclude OpenCL tests from default test list for Android as they are experimental.
10 years ago
Roman Donchenko
45a1063c4a
Merge pull request #3263 from asmorkalov:python_tests_package_lintian
10 years ago
Alexander Smorkalov
1cc80f10ba
Added implicit dependency from python and python-py to debian packages.
10 years ago
Maksim Shabunin
a160158cb3
Merge pull request #3272 from mgeorg:reset_ffmpeg_mutex_2_4
10 years ago
Vadim Pisarevsky
6a53cb9307
Merge pull request #3266 from mshabunin:arm_warning
10 years ago
Vadim Pisarevsky
1920232268
Merge pull request #3260 from a-wi:MSMF_file_error
10 years ago
Manfred Georg
7f4eb4f6c6
set ffmpeg mutex to NULL on destruction.
...
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
10 years ago
Dinar Ahmatnurov
de6edcc48a
fixing issue with "ёЁ";
10 years ago
Maksim Shabunin
e88a36621e
Fixed warning during cross compile for ARM
10 years ago
Dinar Ahmatnurov
e9f7c4aeba
added Cyrillic;
...
added Cyrillic;
replace binary format with hex;
move duplicated code to inline function;
10 years ago
Vadim Pisarevsky
467f5fc90f
Merge pull request #3261 from a-wi:CMake_FFMPEG_config
10 years ago
Vadim Pisarevsky
ad018da224
Merge pull request #3262 from StevenPuttemans:fix_window_param
10 years ago
StevenPuttemans
90a1c6b1f0
fixing some wrong CPP prefixes - still old interface
10 years ago
Artur Wieczorek
93d1ceae43
Use FFMPEG capture only if HAVE_FFMPEG flag is defined.
10 years ago
Artur Wieczorek
073a7ff95a
Fixed CMake issue with FFMPEG highgui configuration
...
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.
10 years ago
Artur Wieczorek
5bf1a4c08c
Fixed MSMF file capture error while opening the file containing unsupported video stream format
10 years ago
Vadim Pisarevsky
562ff9d111
Merge pull request #3255 from bhack:fix_cuda_macosx
10 years ago
bhack
32f6e1a554
Fix for bug #3469 CV_XADD failing in clang+nvcc combination
...
Taken from 3f07655231
10 years ago
Vadim Pisarevsky
10bbcca11e
Merge pull request #3251 from a-wi:MSMF_camera_errors
10 years ago
Vadim Pisarevsky
19b3aab23f
Merge pull request #3244 from tstellarAMD:2.4-ocl-inline-fix-v2
10 years ago
Vadim Pisarevsky
df28bb5ccd
Merge pull request #3190 from StevenPuttemans:fix_simpleblobdetector
10 years ago
StevenPuttemans
d4ec359f11
Fixing errors
10 years ago
Artur Wieczorek
3603102c89
Fixed assertion warning in MSMF frame grabber
10 years ago
Artur Wieczorek
a615102947
Fixed MSMF video capture initialization
10 years ago
Vadim Pisarevsky
9c91d0103f
Merge pull request #3247 from a-wi:CMake_MSMF_configuration
10 years ago
Vadim Pisarevsky
37a1767286
Merge pull request #3243 from a-wi:MSMF_linking_error
10 years ago
StevenPuttemans
03662c0589
fix blobdetector
10 years ago
Artur Wieczorek
7c354c14f7
CMake configuration for MSMF capture
10 years ago
Artur Wieczorek
d2ba09e6ff
Fix linking error under Win 7 - do not import MinCore_Downlevel.lib if target is Win 7 or earlier.
10 years ago
Tom Stellard
934394c5e2
ocl: Don't use 'inline' attribute on functions
...
In C99 'inline' is not a hint to the compiler to inline the function,
it is an attribute that affects the linkage of the function. 'inline'
functions are required to have a definition in a different compiliation
unit, so compilers are free to delete 'inline' functions if they want to.
This issue can be seen in Clang when compiling at -O0. Clang
will sometimes delete 'inline' functions which creates an invalid
program.
Issue 3746: http://code.opencv.org/issues/3746
10 years ago
Vadim Pisarevsky
6c3cadbd73
Merge pull request #3240 from a-wi:MSMF_compilation_errors
10 years ago
Vadim Pisarevsky
4dda2002f6
Merge pull request #3241 from WilhelmHannemann:bugfix_brute_force_match_cl
10 years ago
Artur Wieczorek
539f8032dc
Fixed compilation errors under VS 2010 and Win 7
10 years ago
WilhelmHannemann
f8c5128729
Merge branch 'bugfix_brute_force_match_cl' of https://github.com/WilhelmHannemann/opencv into bugfix_brute_force_match_cl
10 years ago