Vadim Pisarevsky [Mon, 22 Dec 2014 10:55:23 +0000 (10:55 +0000)]
Merge pull request #3471 from HelenWong:FixBug3714
Vadim Pisarevsky [Mon, 22 Dec 2014 10:54:57 +0000 (10:54 +0000)]
Merge pull request #3484 from euphrat:gmg_update_fix
Vadim Pisarevsky [Mon, 22 Dec 2014 10:41:20 +0000 (10:41 +0000)]
Merge pull request #3511 from mattip:2.4
Vadim Pisarevsky [Mon, 22 Dec 2014 10:38:55 +0000 (10:38 +0000)]
Merge pull request #3514 from mshabunin:compat-24
Vadim Pisarevsky [Mon, 22 Dec 2014 10:28:33 +0000 (10:28 +0000)]
Merge pull request #3500 from StevenPuttemans:fix_2432_2.4
Vadim Pisarevsky [Mon, 22 Dec 2014 10:27:01 +0000 (10:27 +0000)]
Merge pull request #3515 from StevenPuttemans:fix_FeatureDetector_docs
Vadim Pisarevsky [Thu, 18 Dec 2014 14:49:35 +0000 (14:49 +0000)]
Merge pull request #3522 from ilya-lavrenov:update_android_toolchain_cmake
Ilya Lavrenov [Wed, 17 Dec 2014 17:08:55 +0000 (20:08 +0300)]
update android.toolchain.cmake
Maksim Shabunin [Fri, 12 Dec 2014 07:44:10 +0000 (10:44 +0300)]
Some changes to make migration to 3.0 easier
Vadim Pisarevsky [Mon, 15 Dec 2014 18:08:30 +0000 (18:08 +0000)]
Merge pull request #3498 from ilya-lavrenov:omp
Vadim Pisarevsky [Mon, 15 Dec 2014 18:02:29 +0000 (18:02 +0000)]
Merge pull request #3449 from Ashod:2.4_highgui_trackbar_improvements
StevenPuttemans [Wed, 10 Dec 2014 12:45:42 +0000 (13:45 +0100)]
fix bug 2432 for 2.4 branch
StevenPuttemans [Mon, 15 Dec 2014 10:31:18 +0000 (11:31 +0100)]
add extra to FeatureDetector docs
mattip [Sun, 14 Dec 2014 09:55:02 +0000 (11:55 +0200)]
export thread control to generated wrappers
Ilya Lavrenov [Wed, 3 Dec 2014 11:59:51 +0000 (14:59 +0300)]
ability to enable OpenMP simultaneously with other parallel framework
Ashod Nakashian [Tue, 25 Nov 2014 22:20:54 +0000 (17:20 -0500)]
highgui: Support to change trackbar count in setTrackbarPos and replaced deprecated CreateToolbarEx in Windows.
Vadim Pisarevsky [Sat, 6 Dec 2014 08:07:56 +0000 (08:07 +0000)]
Merge pull request #3480 from mshabunin:python-test-24
Vadim Pisarevsky [Sat, 6 Dec 2014 08:03:56 +0000 (08:03 +0000)]
Merge pull request #3488 from jeremyhu:PR-4048
Jeremy Huddleston Sequoia [Fri, 5 Dec 2014 18:22:11 +0000 (10:22 -0800)]
Fix tautologies in calibfilter.cpp which cause a build failure when using -Werror=address with clang-3.5
http://code.opencv.org/issues/4048
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Firat Kalaycilar [Thu, 4 Dec 2014 20:36:42 +0000 (22:36 +0200)]
minor fix to make "updateBackgroundModel=false" option meaningful.
Maksim Shabunin [Wed, 3 Dec 2014 14:57:35 +0000 (17:57 +0300)]
Python test: new options provide local test data paths
HelenWong [Mon, 1 Dec 2014 18:39:45 +0000 (10:39 -0800)]
Fix#3714:Improve Display Image Tutorial
For Bug #3714, user use the imshow() function without calling
namedWindow() properly, because user did not know the implicit rule for
imshow(). (i.e. without calling namedWindow implied calling namedWindow(
,CV__WINDOW_AUTOSIZE).
Improve the Display Image Tutorial to educate the user for such implied
rule.
Put a note on documentation for Bug#3714
Revise the documentation regarding to imshow() function to better
educate the user the implicit rule. (i.e. without creating the window
before the imshow() function is the same as creating AUTOSIZE window)
Vadim Pisarevsky [Mon, 1 Dec 2014 10:40:56 +0000 (10:40 +0000)]
Merge pull request #3445 from jet47:get-rid-of-cuda-h
Vadim Pisarevsky [Mon, 1 Dec 2014 10:40:12 +0000 (10:40 +0000)]
Merge pull request #3447 from a-wi:Fill_ellipse_arc
Artur Wieczorek [Tue, 25 Nov 2014 17:47:19 +0000 (18:47 +0100)]
Fix determining bounding box of the edge collection in FillEdgeCollection().
There is necessary to account also x-ccordinate of the end of the edge when determining bounding box of the edge collection.
Vladislav Vinogradov [Tue, 25 Nov 2014 15:29:56 +0000 (18:29 +0300)]
get rid of cuda.h usage
Vadim Pisarevsky [Mon, 24 Nov 2014 09:40:21 +0000 (09:40 +0000)]
Merge pull request #3433 from StevenPuttemans:fix_whitebalance_naming
StevenPuttemans [Wed, 19 Nov 2014 11:02:32 +0000 (12:02 +0100)]
fix wrong property name and corresponding documentation
Vadim Pisarevsky [Sun, 16 Nov 2014 18:17:53 +0000 (18:17 +0000)]
Merge pull request #3419 from samyak-268:2.4
Vadim Pisarevsky [Sun, 16 Nov 2014 18:06:20 +0000 (18:06 +0000)]
Merge pull request #3425 from StevenPuttemans:fix_firewire_buffersize
Vadim Pisarevsky [Sun, 16 Nov 2014 18:05:17 +0000 (18:05 +0000)]
Merge pull request #3427 from tstellarAMD:2.4-farneback-crash-fix
StevenPuttemans [Fri, 14 Nov 2014 13:09:43 +0000 (14:09 +0100)]
added extra BUFFERSIZE doc and getter
Tom Stellard [Thu, 13 Nov 2014 16:16:10 +0000 (11:16 -0500)]
ocl: Move static oclMat variables into FarnebackOpticalFlow class
Move some static functions into the FarnebackOpticalFlow class as well,
so they can access these new class variables.
oclMat objects cannot be declared statically, because their destructor
depends on the statically defined __module variable from cl_context.cpp.
Since statically defined variables in separate compilation units have
an undefined destruction order there is always the possibility the
__module will be destructed before an oclMat object, which results
in a segfault.
Vadim Pisarevsky [Thu, 13 Nov 2014 15:40:29 +0000 (15:40 +0000)]
Merge pull request #3421 from SpecLad:ncv-algorithm
Roman Donchenko [Thu, 13 Nov 2014 13:16:26 +0000 (16:16 +0300)]
NCV.cu: include <algorithm>
It's needed for std::max.
Vadim Pisarevsky [Thu, 13 Nov 2014 07:27:33 +0000 (07:27 +0000)]
Merge pull request #3412 from StevenPuttemans:ieee1934_camera_set_params
Vadim Pisarevsky [Thu, 13 Nov 2014 07:20:30 +0000 (07:20 +0000)]
Merge pull request #3414 from SpecLad:vg-stereogc
Alexander Alekhin [Thu, 13 Nov 2014 01:49:06 +0000 (01:49 +0000)]
Merge pull request #3418 from tstellarAMD:2.4-hog-crash-fix
Samyak Datta [Wed, 12 Nov 2014 18:05:02 +0000 (23:35 +0530)]
C++ sample code to detect facial features
Maksim Shabunin [Wed, 12 Nov 2014 17:48:43 +0000 (17:48 +0000)]
Merge pull request #3417 from ilya-lavrenov:dox_warn
Ilya Lavrenov [Wed, 12 Nov 2014 16:18:45 +0000 (19:18 +0300)]
attemp to fix dox warning
Tom Stellard [Mon, 10 Nov 2014 15:10:42 +0000 (10:10 -0500)]
ocl: Fix crash during destruction of gauss_w_lut object in hog.cpp
gauss_w_lut is a statically defined variable of type oclMat. The oclMat
destructor calls openCLFree() which via getInitializationMutex() accesses
the __module variable which has been statically defined in cl_context.cpp
Since the destruction order of statically defined variables in different
compilation units is undefined, it is possible that __module will
be destructed before gauss_w_lut, which would result in a segfault when
getInitializationMutex() is called while destructing gauss_w_lut.
In order to avoid this issue, we need to make gauss_w_lut a private
member of the HOGDescriptors class so we know it will be destroyed
before __module.
Roman Donchenko [Wed, 12 Nov 2014 14:00:08 +0000 (17:00 +0300)]
Fix uninitialized memory reads and memory leaks in StereoGC
StevenPuttemans [Wed, 12 Nov 2014 09:48:24 +0000 (10:48 +0100)]
adding extra buffer parameter
Vadim Pisarevsky [Tue, 11 Nov 2014 13:27:41 +0000 (13:27 +0000)]
Merge pull request #3401 from SpecLad:optflow-bogus-Warray-bounds
Roman Donchenko [Fri, 7 Nov 2014 10:35:20 +0000 (13:35 +0300)]
Suppress a bogus -Warray-bounds in modules/superres/src/optical_flow.cpp
This is actually the same warning that the suppression at the bottom
suppresses, but that one doesn't suppress it when using a native compiler
(go figure).
I remove the forced inclusion of precompiled headers into all sources,
since otherwise this workaround doesn't work - the header with the warning
is included before I can use a pragma.
Vadim Pisarevsky [Mon, 10 Nov 2014 08:27:41 +0000 (08:27 +0000)]
Merge pull request #3322 from StevenPuttemans:fix_pvpapi_interface
Vadim Pisarevsky [Thu, 6 Nov 2014 08:41:07 +0000 (08:41 +0000)]
Merge pull request #3305 from tSed:opencv-2.4.x/opencv.pc-generation-refactoring
Vadim Pisarevsky [Wed, 5 Nov 2014 11:35:19 +0000 (11:35 +0000)]
Merge pull request #3294 from mshabunin:fix-ios-warnings-24
Vadim Pisarevsky [Wed, 5 Nov 2014 11:13:03 +0000 (11:13 +0000)]
Merge pull request #3376 from vriera:2.4
Samuel Martin [Thu, 2 Oct 2014 22:32:40 +0000 (00:32 +0200)]
cmake/OpenCVGenPkgconfig.cmake: rework opencv.pc generation
Using absolute path to locate the components in the "Libs:" field of the
*.pc can badly break cross-compilation, especially when building
statically linked objects.
Indeed, pkg-config automatically replaces the '-I...' and '-L...' paths
when the PKG_CONFIG_SYSROOT_DIR and PKG_CONFIG_LIBDIR environment
variables are set [1]. This feature is very helpful and common in
cross-compilation framework like Buildroot [2,3].
When there are absolute paths in the *.pc files, pkg-config won't be
able to do the path substitions for these paths when the afromentioned
environment variables are set.
In such case, since the prefix is the target one, not the sysroot one,
these libraries' abolute paths will point to:
- in the best case: a non-existing file (i.e. these files do not exists
on the host system;
- at worst: the host system's libraries. This will make the linking
failed because these host system's libraries will most likely not be
build for the target architecture [4].
So, this patch replace the components' absolute paths by the form:
-L<libdir> -l<libname>
This way, the linker will be able to resolve each dependency path,
whatever the kind of objects/build (shared object or static build) it
is dealing with.
Note that for static link, the library order does matter [5]. The order
of the opencv components has been carefully chosen to comply with this
requirement.
Fixes #3931
[1] http://linux.die.net/man/1/pkg-config
[2] http://buildroot.org/
[3] http://git.buildroot.net/buildroot/tree/package/pkgconf/pkg-config.in
[4] http://autobuild.buildroot.net/results/e8a/
e8a859276db34aff87ef181b0cce98916b0afc90/build-end.log
[5] http://stackoverflow.com/questions/45135/linker-order-gcc
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
Note: this patch properly applies on top of the master branch, though it
has been written on top of the 2.4 branch.
Vadim Pisarevsky [Fri, 31 Oct 2014 11:18:23 +0000 (11:18 +0000)]
Merge pull request #3382 from StevenPuttemans:fix_3982
Vadim Pisarevsky [Thu, 30 Oct 2014 10:42:24 +0000 (10:42 +0000)]
Merge pull request #3364 from mshabunin:doxygen-docs-24
StevenPuttemans [Wed, 29 Oct 2014 12:50:20 +0000 (13:50 +0100)]
fixing SVM negative value rounding
StevenPuttemans [Thu, 9 Oct 2014 09:30:42 +0000 (11:30 +0200)]
fixing cap_pvpapi interface and making sure both AVT Manta and Proscilla
series are supported. Testing this with both cams for Windows and Linux
exhaustively.
Optimizing memory footprint by removing unused calls.
Adapted with the input of Shai
Added small example that illustrates how it should work.
Vicente Olivert Riera [Mon, 27 Oct 2014 13:39:35 +0000 (13:39 +0000)]
superres: Fix \ 1\ 1return value VideoFrameSource_GPU
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 \ 1createFrameSource_Video_GPU function should be a VideoFrameSource_GPU object.
Maksim Shabunin [Tue, 21 Oct 2014 11:41:02 +0000 (15:41 +0400)]
iOS framework build script changes from master branch
Maksim Shabunin [Mon, 20 Oct 2014 12:06:32 +0000 (16:06 +0400)]
Fixed iOS framework compilation warnings
Maksim Shabunin [Mon, 20 Oct 2014 08:59:17 +0000 (12:59 +0400)]
iOS framework build script changes
- buildbot process support (break build in case of errors)
- disabled some warnings in cmake script
Maksim Shabunin [Mon, 27 Oct 2014 11:56:25 +0000 (11:56 +0000)]
Merge pull request #3336 from BKNio:putText_develop2
Dinar Ahmatnurov [Tue, 14 Oct 2014 13:11:18 +0000 (17:11 +0400)]
fixed issue with malformed UTF-8 string;
ocl: Change static variable order in cl_context.cpp to avoid crashes during destruction
ContextImpl::currentContext contains a reference to one of the
DeviceInfoImpl objects from:
static std::vector<DeviceInfoImpl> global_devices;
ContextImpl::currentContext is destroyed in the destructor
for the statically defined object __module, and relies on its
DeviceInfoImpl reference to query some hardware features while
being destroyed.
This means that we need to ensure that the global_devices vector is
destroyed affter __module, otherwise ContextImpl::currentContext's
DeviceInfoImpl reference will no longer be valid when __module is
destroyed.
Since these variables are all confined to a single compilation unit,
they will be destruct from bottom to top, so we need to make sure
that __module is the bottom definition so it can be destroyed first.
iOS: fix crash from overrelease in UIImageToMat
viz: fixed memory leak, issue 3961
fix installation layout for debian packages:
Install symlinks to shared libraries as a part of development package,
not runtime package.
It is default behavior for debian packages.
Fix test name.
TIFF loader: Allocate large enough buffer when (bpp * ncn) > 8.
TIFF loader: Pass buffer size to read functions.
replace not ascii and not cyrillic symbols with '?';
add test for putText;
fix warning;
minor fixes;
Vadim Pisarevsky [Sun, 26 Oct 2014 17:44:07 +0000 (17:44 +0000)]
Merge pull request #3362 from mshabunin:fix-drawing-24
Vadim Pisarevsky [Sun, 26 Oct 2014 17:42:24 +0000 (17:42 +0000)]
Merge pull request #3363 from asmorkalov:qnx_support
Vadim Pisarevsky [Sun, 26 Oct 2014 17:41:14 +0000 (17:41 +0000)]
Merge pull request #3366 from jet47:fix-gpu-cuda-7.0
Vadim Pisarevsky [Sun, 26 Oct 2014 17:40:35 +0000 (17:40 +0000)]
Merge pull request #3356 from jet47:ctest-support
Vladislav Vinogradov [Thu, 23 Oct 2014 15:33:19 +0000 (19:33 +0400)]
minor fix for StereoCSBP data cost compute kernel and test
Vladislav Vinogradov [Thu, 23 Oct 2014 14:39:36 +0000 (18:39 +0400)]
increase epsilons for some tests, which functions use floating point arithm
Vladislav Vinogradov [Thu, 23 Oct 2014 14:09:49 +0000 (18:09 +0400)]
avoid pointer arithmetic on register memory in color conversion
Maksim Shabunin [Thu, 9 Oct 2014 10:04:00 +0000 (14:04 +0400)]
Basic doxygen documentation support
- updated existing Doxyfile.in
- added corresponding cmake instructions
- added some specific files (layout, icon)
- clean existing doxygen warnings
Conflicts:
CMakeLists.txt
doc/CMakeLists.txt
modules/core/include/opencv2/core.hpp
modules/core/include/opencv2/core/base.hpp
modules/core/include/opencv2/core/cuda.inl.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/matx.hpp
modules/core/include/opencv2/core/types.hpp
modules/flann/include/opencv2/flann/lsh_table.h
modules/imgproc/include/opencv2/imgproc.hpp
Alexander Smorkalov [Thu, 23 Oct 2014 09:01:42 +0000 (13:01 +0400)]
Fixes for QNX 6.6 Neitrino support.
Maksim Shabunin [Thu, 23 Oct 2014 09:28:33 +0000 (13:28 +0400)]
Fixed highgui drawing test
- changed image comparison technique
- removed old assert statements
Vladislav Vinogradov [Tue, 21 Oct 2014 14:51:02 +0000 (18:51 +0400)]
determine test category (Public vs Extra) based on module location
Vladislav Vinogradov [Tue, 21 Oct 2014 14:50:38 +0000 (18:50 +0400)]
add CTest targets for sanity tests
Vladislav Vinogradov [Tue, 21 Oct 2014 14:49:53 +0000 (18:49 +0400)]
disable CTest target for opencv_test_viz:
opencv_test_viz creates windows and waits until user close them,
it is not appropriate for automatic testing
Vladislav Vinogradov [Tue, 21 Oct 2014 14:48:46 +0000 (18:48 +0400)]
rewrite add_test command for accuracy tests:
* use new syntax introduced in CMake 2.8.0
* set OPENCV_TEST_DATA_PATH enviroment property
Vladislav Vinogradov [Tue, 21 Oct 2014 14:45:47 +0000 (18:45 +0400)]
turn on testing support in root binary directory
Vadim Pisarevsky [Mon, 20 Oct 2014 06:44:10 +0000 (06:44 +0000)]
Merge pull request #3350 from Trundle:fix_some_tiff_crashes
Andreas Stührk [Sat, 18 Oct 2014 23:22:18 +0000 (01:22 +0200)]
TIFF loader: Pass buffer size to read functions.
Andreas Stührk [Sat, 18 Oct 2014 23:22:04 +0000 (01:22 +0200)]
TIFF loader: Allocate large enough buffer when (bpp * ncn) > 8.
Andreas Stührk [Sat, 18 Oct 2014 23:13:35 +0000 (01:13 +0200)]
Fix test name.
Vadim Pisarevsky [Sat, 18 Oct 2014 17:00:52 +0000 (17:00 +0000)]
Merge pull request #3341 from jet47:deb-package-lib-symlinks
Vadim Pisarevsky [Sat, 18 Oct 2014 16:57:55 +0000 (16:57 +0000)]
Merge pull request #3346 from Nerei:fixed_memory_leak_in_viz
Anatoly Baksheev [Sat, 18 Oct 2014 14:12:36 +0000 (18:12 +0400)]
viz: fixed memory leak, issue 3961
Vadim Pisarevsky [Fri, 17 Oct 2014 11:36:24 +0000 (11:36 +0000)]
Merge pull request #3340 from AdLantis:2.4
Vladislav Vinogradov [Fri, 17 Oct 2014 09:23:23 +0000 (13:23 +0400)]
fix installation layout for debian packages:
Install symlinks to shared libraries as a part of development package,
not runtime package.
It is default behavior for debian packages.
Thomas Weisbach [Fri, 17 Oct 2014 08:49:14 +0000 (17:49 +0900)]
iOS: fix crash from overrelease in UIImageToMat
Vadim Pisarevsky [Thu, 16 Oct 2014 10:07:13 +0000 (10:07 +0000)]
Merge pull request #3337 from tstellarAMD:2.4-ocl-context-cleanup-fix
Tom Stellard [Wed, 15 Oct 2014 00:41:23 +0000 (20:41 -0400)]
ocl: Change static variable order in cl_context.cpp to avoid crashes during destruction
ContextImpl::currentContext contains a reference to one of the
DeviceInfoImpl objects from:
static std::vector<DeviceInfoImpl> global_devices;
ContextImpl::currentContext is destroyed in the destructor
for the statically defined object __module, and relies on its
DeviceInfoImpl reference to query some hardware features while
being destroyed.
This means that we need to ensure that the global_devices vector is
destroyed affter __module, otherwise ContextImpl::currentContext's
DeviceInfoImpl reference will no longer be valid when __module is
destroyed.
Since these variables are all confined to a single compilation unit,
they will be destruct from bottom to top, so we need to make sure
that __module is the bottom definition so it can be destroyed first.
Vadim Pisarevsky [Sun, 12 Oct 2014 13:42:38 +0000 (13:42 +0000)]
Merge pull request #3331 from tSed:opencv-2.4.x/fix-x86-PIC-compilation
Samuel Martin [Sun, 12 Oct 2014 08:17:23 +0000 (10:17 +0200)]
core: fix x86 PIC code compilation
This bug was triggered by Buildroot autobuilders [1,2], causing this
kind of failures [3,4]:
[ 14%] Building CXX object modules/core/CMakeFiles/opencv_core.dir/src/system.cpp.o
/home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp: In function '(static initializers for /home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp)':
/home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp:280:10: error: inconsistent operand constraints in an 'asm'
make[3]: *** [modules/core/CMakeFiles/opencv_core.dir/src/system.cpp.o] Error 1
[1] http://buildroot.org/
[2] http://autobuild.buildroot.org/
[3] http://autobuild.buildroot.org/?reason=opencv-2.4.10
[4] http://autobuild.buildroot.org/results/483/
4838285b25d6293a5cf0bb9eadd5040a7c75d766/build-end.log
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Vadim Pisarevsky [Sat, 11 Oct 2014 18:06:25 +0000 (18:06 +0000)]
Merge pull request #3265 from BKNio:putText_develop
Vadim Pisarevsky [Sat, 11 Oct 2014 17:41:23 +0000 (17:41 +0000)]
Merge pull request #3329 from taka-no-me:patch-1
Vadim Pisarevsky [Sat, 11 Oct 2014 17:35:50 +0000 (17:35 +0000)]
Merge pull request #3300 from rohitrawat:bug_3787_docs_NAryMatIterator
Vadim Pisarevsky [Sat, 11 Oct 2014 17:26:19 +0000 (17:26 +0000)]
Merge pull request #3327 from JonasVautherin:patch_cmake_android_r10
Andrey Kamaev [Sat, 11 Oct 2014 16:35:48 +0000 (20:35 +0400)]
silence cmake 3.0+ warnings on LOCATION attribute
Jonas Vautherin [Fri, 10 Oct 2014 13:07:11 +0000 (15:07 +0200)]
Patch for NDK r10
Dinar Ahmatnurov [Fri, 10 Oct 2014 13:11:20 +0000 (17:11 +0400)]
fix issue with font;
Vadim Pisarevsky [Fri, 10 Oct 2014 11:02:50 +0000 (11:02 +0000)]
Merge pull request #3307 from ilya-lavrenov:ffmpeg_rtsp
Ilya Lavrenov [Mon, 6 Oct 2014 07:56:30 +0000 (07:56 +0000)]
TCP instead of UDP
Vadim Pisarevsky [Thu, 9 Oct 2014 15:00:25 +0000 (15:00 +0000)]
Merge pull request #3298 from a-wi:DShow_capture