platform/upstream/opencv.git
6 years agocmake: don't include protobuf on disabled DNN module
Alexander Alekhin [Mon, 31 Jul 2017 11:18:59 +0000 (14:18 +0300)]
cmake: don't include protobuf on disabled DNN module

6 years agoMerge pull request #9259 from eyolfson:patch-1
Alexander Alekhin [Sun, 30 Jul 2017 10:08:23 +0000 (10:08 +0000)]
Merge pull request #9259 from eyolfson:patch-1

6 years agoMerge pull request #9261 from puqeko:patch-2
Alexander Alekhin [Sun, 30 Jul 2017 10:07:09 +0000 (10:07 +0000)]
Merge pull request #9261 from puqeko:patch-2

6 years agoMerge pull request #9255 from marting87:marting87/gpu_samples_usage_msg
Alexander Alekhin [Sun, 30 Jul 2017 09:54:53 +0000 (09:54 +0000)]
Merge pull request #9255 from marting87:marting87/gpu_samples_usage_msg

6 years agoMerge pull request #9254 from jtkb:feature/maven_package_update
Alexander Alekhin [Sun, 30 Jul 2017 09:54:01 +0000 (09:54 +0000)]
Merge pull request #9254 from jtkb:feature/maven_package_update

6 years agoMerge pull request #9241 from alalek:tlsSlotsSize
Alexander Alekhin [Sun, 30 Jul 2017 09:53:39 +0000 (09:53 +0000)]
Merge pull request #9241 from alalek:tlsSlotsSize

6 years agoAdd tested codecs for OSX
puqeko [Fri, 28 Jul 2017 23:56:02 +0000 (11:56 +1200)]
Add tested codecs for OSX

6 years agoRemove unused method declarations in hog.cpp
Jon Eyolfson [Fri, 28 Jul 2017 14:19:35 +0000 (10:19 -0400)]
Remove unused method declarations in hog.cpp

The class `App` appears to have two unused methods: `message` and `checkRectSimilarity`. The is no definition or use of either of these methods. This appears to be dead code.

6 years agoUpdated package dependency list & package check script.
Kerry Billingham [Wed, 26 Jul 2017 08:28:42 +0000 (09:28 +0100)]
Updated package dependency list & package check script.

6 years agoRemoved _gpu-suffix from usage messages to align with executable name
Martin Ganeff [Fri, 28 Jul 2017 08:20:59 +0000 (10:20 +0200)]
Removed _gpu-suffix from usage messages to align with executable name

6 years agoMerge pull request #9238 from alalek:valgrind_fixes
Alexander Alekhin [Thu, 27 Jul 2017 14:33:00 +0000 (14:33 +0000)]
Merge pull request #9238 from alalek:valgrind_fixes

6 years agocore(tls): hide assertions from Thread Sanitizer
Alexander Alekhin [Thu, 27 Jul 2017 14:31:51 +0000 (17:31 +0300)]
core(tls): hide assertions from Thread Sanitizer

6 years agocore(tls): don't use tlsSlots without synchronization
Alexander Alekhin [Wed, 26 Jul 2017 19:45:55 +0000 (22:45 +0300)]
core(tls): don't use tlsSlots without synchronization

6 years agoMerge pull request #9233 from LaurentBerger:dnndoc
Alexander Alekhin [Wed, 26 Jul 2017 16:25:28 +0000 (16:25 +0000)]
Merge pull request #9233 from LaurentBerger:dnndoc

6 years agoflann: fix out of buffer access
Alexander Alekhin [Wed, 26 Jul 2017 15:16:39 +0000 (18:16 +0300)]
flann: fix out of buffer access

6 years agoimgproc: fix vectorized code of accumulate
Alexander Alekhin [Wed, 26 Jul 2017 10:11:31 +0000 (13:11 +0300)]
imgproc: fix vectorized code of accumulate

6 years agocalib3d: fix invalid memory access
Alexander Alekhin [Tue, 25 Jul 2017 16:58:00 +0000 (19:58 +0300)]
calib3d: fix invalid memory access

6 years agodnn: protobuf shutdown
Alexander Alekhin [Tue, 25 Jul 2017 13:13:56 +0000 (16:13 +0300)]
dnn: protobuf shutdown

6 years agots: don't run large videoio test (valgrind)
Alexander Alekhin [Tue, 25 Jul 2017 17:16:32 +0000 (20:16 +0300)]
ts: don't run large videoio test (valgrind)

6 years agots: don't run imgcodecs tests on large images (valgrind)
Alexander Alekhin [Mon, 24 Jul 2017 20:27:14 +0000 (23:27 +0300)]
ts: don't run imgcodecs tests on large images (valgrind)

6 years agots: don't run DNN tests with large models (valgrind)
Alexander Alekhin [Mon, 24 Jul 2017 16:24:46 +0000 (19:24 +0300)]
ts: don't run DNN tests with large models (valgrind)

6 years agocmake: fix compiler flags
Alexander Alekhin [Mon, 24 Jul 2017 08:36:21 +0000 (11:36 +0300)]
cmake: fix compiler flags

6 years agots: update valgrind suppressions
Alexander Alekhin [Fri, 21 Jul 2017 13:42:28 +0000 (16:42 +0300)]
ts: update valgrind suppressions

6 years agoMerge pull request #9236 from dkurt:fix_json_bool
Alexander Alekhin [Wed, 26 Jul 2017 13:08:13 +0000 (13:08 +0000)]
Merge pull request #9236 from dkurt:fix_json_bool

6 years agoMerge pull request #9237 from alalek:fix_winrt_build
Alexander Alekhin [Wed, 26 Jul 2017 10:42:49 +0000 (10:42 +0000)]
Merge pull request #9237 from alalek:fix_winrt_build

6 years agoMerge pull request #9217 from alalek:cleanup_3rdparty
Alexander Alekhin [Wed, 26 Jul 2017 10:38:28 +0000 (10:38 +0000)]
Merge pull request #9217 from alalek:cleanup_3rdparty

6 years agoMerge pull request #9215 from alalek:cmake_min_version
Alexander Alekhin [Wed, 26 Jul 2017 10:38:11 +0000 (10:38 +0000)]
Merge pull request #9215 from alalek:cmake_min_version

6 years agoFix JSON booleans without quotes
dkurt [Wed, 26 Jul 2017 08:08:09 +0000 (11:08 +0300)]
Fix JSON booleans without quotes

6 years agowinrt: update script for MSVS2017 / SDK 10.0
Alexander Alekhin [Wed, 26 Jul 2017 09:02:43 +0000 (12:02 +0300)]
winrt: update script for MSVS2017 / SDK 10.0

6 years agoupdate tutorial link for dnn
LaurentBerger [Tue, 25 Jul 2017 11:22:31 +0000 (13:22 +0200)]
update tutorial link for dnn

6 years agoMerge pull request #9227 from alalek:cmake_fix_ocv_add_testdata
Alexander Alekhin [Tue, 25 Jul 2017 15:56:57 +0000 (15:56 +0000)]
Merge pull request #9227 from alalek:cmake_fix_ocv_add_testdata

6 years agoMerge pull request #9232 from dkurt:json_named_nodes
Alexander Alekhin [Tue, 25 Jul 2017 15:56:03 +0000 (15:56 +0000)]
Merge pull request #9232 from dkurt:json_named_nodes

6 years agoMerge pull request #9229 from alalek:dnn_torch_memory_leaks
Alexander Alekhin [Tue, 25 Jul 2017 13:23:18 +0000 (13:23 +0000)]
Merge pull request #9229 from alalek:dnn_torch_memory_leaks

6 years agoMerge pull request #9230 from alalek:mat_cleanup_on_exception
Alexander Alekhin [Tue, 25 Jul 2017 13:17:09 +0000 (13:17 +0000)]
Merge pull request #9230 from alalek:mat_cleanup_on_exception

6 years agoMissed NAMED bit of JSON nodes tag
dkurt [Tue, 25 Jul 2017 10:39:32 +0000 (13:39 +0300)]
Missed NAMED bit of JSON nodes tag

6 years agobuild: replace WIN32 => _WIN32
Alexander Alekhin [Tue, 25 Jul 2017 10:23:44 +0000 (13:23 +0300)]
build: replace WIN32 => _WIN32

6 years agocore: fix Mat/UMat cleanup on exceptions in deallocate()
Alexander Alekhin [Tue, 25 Jul 2017 09:26:53 +0000 (12:26 +0300)]
core: fix Mat/UMat cleanup on exceptions in deallocate()

6 years agodnn: fix torch importer memory leaks
Alexander Alekhin [Tue, 25 Jul 2017 09:20:55 +0000 (12:20 +0300)]
dnn: fix torch importer memory leaks

6 years agoMerge pull request #9222 from dkurt:fix_dnn_tests
Alexander Alekhin [Tue, 25 Jul 2017 09:09:23 +0000 (09:09 +0000)]
Merge pull request #9222 from dkurt:fix_dnn_tests

6 years agoMerge pull request #9228 from neok-m4700:cmake
Alexander Alekhin [Tue, 25 Jul 2017 09:03:10 +0000 (09:03 +0000)]
Merge pull request #9228 from neok-m4700:cmake

6 years agoUpdate OpenCVCompilerOptions.cmake
neok-m4700 [Tue, 25 Jul 2017 08:25:20 +0000 (10:25 +0200)]
Update OpenCVCompilerOptions.cmake

misplaced else

6 years agocmake: fix ocv_add_testdata() hardcoded path
Alexander Alekhin [Tue, 25 Jul 2017 03:56:03 +0000 (06:56 +0300)]
cmake: fix ocv_add_testdata() hardcoded path

6 years agoFix SqueezeNet Halide performance test
dkurt [Mon, 24 Jul 2017 07:45:04 +0000 (10:45 +0300)]
Fix SqueezeNet Halide performance test

6 years agoMerge pull request #9216 from alalek:build_global_defines
Alexander Alekhin [Sat, 22 Jul 2017 04:29:52 +0000 (04:29 +0000)]
Merge pull request #9216 from alalek:build_global_defines

6 years agoMerge pull request #9213 from tomoaki0705:fixDnnBaseline
Alexander Alekhin [Fri, 21 Jul 2017 13:34:47 +0000 (13:34 +0000)]
Merge pull request #9213 from tomoaki0705:fixDnnBaseline

6 years agocleanup unused 3rdparty files
Alexander Alekhin [Fri, 21 Jul 2017 12:07:45 +0000 (15:07 +0300)]
cleanup unused 3rdparty files

6 years agofix linker error when trying CPU_BASELINE=AVX
Tomoaki Teshima [Fri, 21 Jul 2017 12:13:47 +0000 (21:13 +0900)]
fix linker error when trying CPU_BASELINE=AVX

6 years agobuild: enable __STDC_FORMAT_MACROS macro
Alexander Alekhin [Fri, 21 Jul 2017 11:29:03 +0000 (14:29 +0300)]
build: enable __STDC_FORMAT_MACROS macro

6 years agominimal CMake version => 2.8.12.2
Alexander Alekhin [Fri, 21 Jul 2017 11:04:47 +0000 (14:04 +0300)]
minimal CMake version => 2.8.12.2

6 years agoMerge pull request #9209 from alalek:fix_persistence_format
Alexander Alekhin [Fri, 21 Jul 2017 10:55:40 +0000 (10:55 +0000)]
Merge pull request #9209 from alalek:fix_persistence_format

6 years agoMerge pull request #9208 from alalek:ipp_minmaxidx
Alexander Alekhin [Fri, 21 Jul 2017 10:54:57 +0000 (10:54 +0000)]
Merge pull request #9208 from alalek:ipp_minmaxidx

6 years agoIPP: update minMaxIdx, disable some AVX optimizations with mask
Alexander Alekhin [Thu, 20 Jul 2017 15:10:36 +0000 (18:10 +0300)]
IPP: update minMaxIdx, disable some AVX optimizations with mask

6 years agotest: regression test for IPP minMaxIdx problem
Alexander Alekhin [Thu, 20 Jul 2017 15:06:17 +0000 (18:06 +0300)]
test: regression test for IPP minMaxIdx problem

6 years agocore: fix FileStorage format detection in case of .gz archives
Alexander Alekhin [Thu, 20 Jul 2017 16:58:36 +0000 (19:58 +0300)]
core: fix FileStorage format detection in case of .gz archives

6 years agotest: FileStorage format regression test
Alexander Alekhin [Thu, 20 Jul 2017 16:56:47 +0000 (19:56 +0300)]
test: FileStorage format regression test

6 years agoMerge pull request #9190 from alalek:update_java_build
Alexander Alekhin [Thu, 20 Jul 2017 15:32:47 +0000 (15:32 +0000)]
Merge pull request #9190 from alalek:update_java_build

6 years agoMerge pull request #9203 from tomoaki0705:eliminateRandFromTest
Alexander Alekhin [Thu, 20 Jul 2017 15:31:41 +0000 (15:31 +0000)]
Merge pull request #9203 from tomoaki0705:eliminateRandFromTest

6 years agoMerge pull request #9202 from alalek:cmake-3.9.0
Alexander Alekhin [Thu, 20 Jul 2017 15:28:38 +0000 (15:28 +0000)]
Merge pull request #9202 from alalek:cmake-3.9.0

6 years agoMerge pull request #9206 from tomoaki0705:fixC11VS2012
Alexander Alekhin [Thu, 20 Jul 2017 15:27:25 +0000 (15:27 +0000)]
Merge pull request #9206 from tomoaki0705:fixC11VS2012

6 years agoMerge pull request #9194 from tomoaki0705:fixBuildErrorDnn
Alexander Alekhin [Thu, 20 Jul 2017 15:27:07 +0000 (15:27 +0000)]
Merge pull request #9194 from tomoaki0705:fixBuildErrorDnn

6 years agofix build error on Visual Studio 2012
Tomoaki Teshima [Thu, 20 Jul 2017 13:55:10 +0000 (22:55 +0900)]
fix build error on Visual Studio 2012

6 years agoremove some rand functions
Tomoaki Teshima [Thu, 20 Jul 2017 13:43:11 +0000 (22:43 +0900)]
remove some rand functions
  * make test more reproducible

6 years agoMerge pull request #9189 from tomoaki0705:fixCalib3dRandom
Alexander Alekhin [Thu, 20 Jul 2017 12:24:34 +0000 (12:24 +0000)]
Merge pull request #9189 from tomoaki0705:fixCalib3dRandom

6 years agoMerge pull request #9200 from alalek:perf_stitching_win32
Alexander Alekhin [Thu, 20 Jul 2017 12:08:35 +0000 (12:08 +0000)]
Merge pull request #9200 from alalek:perf_stitching_win32

6 years agocmake: fix build with CMake 3.9.0
Alexander Alekhin [Thu, 20 Jul 2017 11:49:37 +0000 (14:49 +0300)]
cmake: fix build with CMake 3.9.0

6 years agoperf: skip stitching OpenCL test on Win32 platform
Alexander Alekhin [Thu, 20 Jul 2017 11:14:22 +0000 (14:14 +0300)]
perf: skip stitching OpenCL test on Win32 platform

6 years agobuild: reuse int32_t workaround from softfloat.hpp
Alexander Alekhin [Thu, 20 Jul 2017 11:01:21 +0000 (14:01 +0300)]
build: reuse int32_t workaround from softfloat.hpp

6 years agofix build error on Visual Studio 2012
Tomoaki Teshima [Wed, 19 Jul 2017 23:27:02 +0000 (08:27 +0900)]
fix build error on Visual Studio 2012

6 years agofix the test fail on Calib3d_SolvePnP.accuracy
Tomoaki Teshima [Wed, 19 Jul 2017 21:32:32 +0000 (06:32 +0900)]
fix the test fail on Calib3d_SolvePnP.accuracy
  * move array size to enum
  * move array size to member variable
  * loosen the eps of SOLVEPNP_P3P
  * loosen the eps in Calib3d_SolveP3P.accuracy

6 years agojava: update source files processing, maven stuff
Alexander Alekhin [Wed, 19 Jul 2017 12:08:11 +0000 (15:08 +0300)]
java: update source files processing, maven stuff

7 years agoMerge pull request #9143 from sovrasov:gen_pattern_fix
Alexander Alekhin [Wed, 19 Jul 2017 15:46:42 +0000 (15:46 +0000)]
Merge pull request #9143 from sovrasov:gen_pattern_fix

7 years agoMerge pull request #9161 from alalek:separate_debug_symbols
Alexander Alekhin [Wed, 19 Jul 2017 15:34:43 +0000 (15:34 +0000)]
Merge pull request #9161 from alalek:separate_debug_symbols

7 years agoMerge pull request #9186 from alalek:cmake_fix_dump_duplication
Alexander Alekhin [Wed, 19 Jul 2017 11:21:47 +0000 (11:21 +0000)]
Merge pull request #9186 from alalek:cmake_fix_dump_duplication

7 years agocmake: ocv_cmake_dump_vars() remove duplicated information
Alexander Alekhin [Wed, 19 Jul 2017 09:37:36 +0000 (12:37 +0300)]
cmake: ocv_cmake_dump_vars() remove duplicated information

7 years agoMerge pull request #9037 from arrybn:googlenet_test
Alexander Alekhin [Tue, 18 Jul 2017 16:35:00 +0000 (16:35 +0000)]
Merge pull request #9037 from arrybn:googlenet_test

7 years agoMerge pull request #9181 from alalek:stitching_perf_test
Alexander Alekhin [Tue, 18 Jul 2017 15:53:32 +0000 (15:53 +0000)]
Merge pull request #9181 from alalek:stitching_perf_test

7 years agoMerge pull request #9180 from alalek:fix_photo_crash_win32
Alexander Alekhin [Tue, 18 Jul 2017 15:52:25 +0000 (15:52 +0000)]
Merge pull request #9180 from alalek:fix_photo_crash_win32

7 years agoRewrote googlenet tests
Aleksandr Rybnikov [Thu, 29 Jun 2017 13:45:17 +0000 (16:45 +0300)]
Rewrote googlenet tests

7 years agostitching(perf): check for available OpenCL memory
Alexander Alekhin [Tue, 18 Jul 2017 14:25:35 +0000 (17:25 +0300)]
stitching(perf): check for available OpenCL memory

7 years agophoto: crash workaround for MSVC 2015 32-bit
Alexander Alekhin [Tue, 18 Jul 2017 13:04:35 +0000 (16:04 +0300)]
photo: crash workaround for MSVC 2015 32-bit

7 years agoMerge pull request #8967 from savuor:rgb2lab_faster
Alexander Alekhin [Mon, 17 Jul 2017 19:55:19 +0000 (19:55 +0000)]
Merge pull request #8967 from savuor:rgb2lab_faster

7 years agoRGB2Lab_f and trilinear interpolation code are in separate branch; cubeRoot(x) instea...
Rostislav Vasilikhin [Fri, 20 Jan 2017 18:56:44 +0000 (21:56 +0300)]
RGB2Lab_f and trilinear interpolation code are in separate branch; cubeRoot(x) instead of std::pow(x, 1.f/3.f)

file with internal accuracy&speed tests moved to lab_tetra branch

7 years agoMerge pull request #8498 from savuor:bit_exact_lab
Alexander Alekhin [Mon, 17 Jul 2017 14:01:05 +0000 (14:01 +0000)]
Merge pull request #8498 from savuor:bit_exact_lab

7 years agoMerge pull request #9176 from alalek:fix_nightly_builds
Alexander Alekhin [Mon, 17 Jul 2017 13:37:46 +0000 (13:37 +0000)]
Merge pull request #9176 from alalek:fix_nightly_builds

7 years agoMerge pull request #9175 from alalek:issue_9169
Alexander Alekhin [Mon, 17 Jul 2017 13:05:11 +0000 (13:05 +0000)]
Merge pull request #9175 from alalek:issue_9169

7 years agoimgproc: fix warp optimizations
Alexander Alekhin [Mon, 17 Jul 2017 12:12:41 +0000 (15:12 +0300)]
imgproc: fix warp optimizations

7 years agocore: fix convertTo() AVX2 optimization
Alexander Alekhin [Mon, 17 Jul 2017 12:02:14 +0000 (15:02 +0300)]
core: fix convertTo() AVX2 optimization

7 years agocore: clarify documentation of cv::Mat::deallocate() method
Alexander Alekhin [Mon, 17 Jul 2017 10:31:47 +0000 (13:31 +0300)]
core: clarify documentation of cv::Mat::deallocate() method

7 years agoMerge pull request #9173 from thcd:patch-1
Alexander Alekhin [Mon, 17 Jul 2017 10:09:33 +0000 (10:09 +0000)]
Merge pull request #9173 from thcd:patch-1

7 years agoMerge pull request #9172 from atinfinity:fixed_cxx11_flag
Alexander Alekhin [Mon, 17 Jul 2017 07:56:30 +0000 (07:56 +0000)]
Merge pull request #9172 from atinfinity:fixed_cxx11_flag

7 years agoFix typo in imgproc.hpp
Shuyu Liang [Mon, 17 Jul 2017 07:51:10 +0000 (15:51 +0800)]
Fix typo in imgproc.hpp

7 years agoinitial version of Lab2RGB_f tetrahedral interpolation written
Rostislav Vasilikhin [Fri, 20 Jan 2017 18:56:44 +0000 (21:56 +0300)]
initial version of Lab2RGB_f tetrahedral interpolation written

RGB2Lab_f added, bugs fixed, moved to float

several bugs fixed

LUT fixed, no switch in tetraInterpolate()

temporary code; to be removed and rewritten

before refactoring

extra interpolations removed, some things to do left

added Lab2RGB_b +XYZ version, etc.

basic version is done, to be sped up

tetra refactored

interpolations: LUT for weights, refactor., etc.

address arithm optimized

initial version of vectorized code added (not compiling now)

compilation fixed, now segfaults

a lot of fixes, vectorization temp. disabled

fixed trilinear shift size, max error dropped from 19 to 10

fixed several bugs (255 vs 256, signed vs unsigned, bIdx)

minor changes

packed: address arithmetics fixed

shorter code

experiments with pure integer calculations

Lab2RGB max error decreased to 2; need to clean the code

ready for vectorization; need cleaning

vectorized, to be debugged

precision fixed, max error is 2

Lab->XYZ shortened

minor fixes

Lab2RGB_f version fixed, to be completely rewritten using _b code

RGB2Lab_f vectorized

minors

moved to separate file

refactored Lab2RGB to float and int versions

minor fix

Lab2RGB_f vectorized

minor refactoring

Lab2RGBint refactored: process methods, vectorize by 4 pix

Lab2RGB_f int version is done

cleanup extra code

code copied to color.cpp

fixed blue idx bug

optimizations enabled when testing; mulFracConst introduced

divConst -> mulFracConst

calc min time in perf instead of avg

minors

process() slightly sped up

Lab2RGB_f: disabled int version

reinterpret added, minor fixes in names

some warnings fixed

changes transferred to color.cpp

RGB2Lab_f code (and trilinear interpolation code) moved to rgb2lab_faster

whitespace

shift negative fixed

more warnings fixed

"constant condition" warnings fixed, little speed up

minor changes

test_photo decolor fixed

changes copied to test_lab.cpp

idx bounds checking in LUT init

several fixes

WIP: softfloat almost integrated

test_lab partially rewritten to SoftFloat

color.cpp rewritten to SoftFloat

test_lab.cpp: accuracy code added

several fixes

RGB2Lab_b testing fixed

splineBuild() rewritten to SoftFloat

accuracy control improved

rounding fixed

Luv <=> RGB: rewritten to SoftFloat

OCL cvtColor Lab and Lut rewritten to SoftFloat

minor fixes

refactored to new SoftFloat interface

round() -> cvRound, etc.

fixed OCL tests

softfloat.cpp: internal functions made static, unused ones removed

meaningful constants

extra lines removed

unused function removed

unfinished work

it works, need to fix TODOs

refactoring; more calls rewritten

mulFracConst removed

constants made bit exact; minors

changes moved to color.cpp

fixed 1 bug and 4 warnings

OCL: fixed constants

pow(x, _1_3f) replaced by cubeRoot(x)

fixed compilation on MSVC32

magic constants explained

file with internal accuracy&speed tests moved to lab_tetra branch

7 years agofixed 'OpenCVDetectCXXCompiler.cmake' to detect C++11 feature
atinfinity [Sun, 16 Jul 2017 15:20:14 +0000 (00:20 +0900)]
fixed 'OpenCVDetectCXXCompiler.cmake' to detect C++11 feature

7 years agoMerge pull request #9133 from sovrasov:mser_add_test
Alexander Alekhin [Fri, 14 Jul 2017 19:38:05 +0000 (19:38 +0000)]
Merge pull request #9133 from sovrasov:mser_add_test

7 years agoMerge pull request #9086 from catree:improve_solvePnPRansac
Alexander Alekhin [Fri, 14 Jul 2017 17:28:47 +0000 (17:28 +0000)]
Merge pull request #9086 from catree:improve_solvePnPRansac

7 years agoMerge pull request #9091 from alalek:update_ffmpeg
Alexander Alekhin [Fri, 14 Jul 2017 17:25:35 +0000 (17:25 +0000)]
Merge pull request #9091 from alalek:update_ffmpeg

7 years agoMerge pull request #9095 from alalek:fix_gstreamer
Alexander Alekhin [Fri, 14 Jul 2017 17:24:14 +0000 (17:24 +0000)]
Merge pull request #9095 from alalek:fix_gstreamer

7 years agoMerge pull request #9159 from alalek:cmake_target_rename
Alexander Alekhin [Fri, 14 Jul 2017 17:19:25 +0000 (17:19 +0000)]
Merge pull request #9159 from alalek:cmake_target_rename

7 years agoMerge pull request #9157 from zhmu:opencv-dshow-allow-enable-disable-of-debug-messages
Alexander Alekhin [Fri, 14 Jul 2017 17:18:31 +0000 (17:18 +0000)]
Merge pull request #9157 from zhmu:opencv-dshow-allow-enable-disable-of-debug-messages

7 years agoMerge pull request #9130 from alalek:android_define
Alexander Alekhin [Fri, 14 Jul 2017 17:17:24 +0000 (17:17 +0000)]
Merge pull request #9130 from alalek:android_define