platform/upstream/opencv.git
9 years agoUpdate window_w32.cpp
Suleyman TURKMEN [Mon, 20 Jul 2015 13:35:00 +0000 (16:35 +0300)]
Update window_w32.cpp

9 years agoMerge pull request #4190 from sbokov:fixingStereoBMissue
Maksim Shabunin [Wed, 15 Jul 2015 14:43:09 +0000 (14:43 +0000)]
Merge pull request #4190 from sbokov:fixingStereoBMissue

9 years agoMerge pull request #4193 from jklontz:master
Alexander Alekhin [Wed, 15 Jul 2015 10:12:07 +0000 (10:12 +0000)]
Merge pull request #4193 from jklontz:master

9 years agofixed conditional compilation of RGB2Gray<ushort> template specialization
Josh Klontz [Wed, 15 Jul 2015 00:56:43 +0000 (20:56 -0400)]
fixed conditional compilation of RGB2Gray<ushort> template specialization

9 years agoFixing possible invalid memory access in validateDisparity
sbokov [Mon, 13 Jul 2015 21:05:30 +0000 (00:05 +0300)]
Fixing possible invalid memory access in validateDisparity

9 years agoMerge pull request #4147 from alalek:fix_world_cyclic_deps
Maksim Shabunin [Tue, 14 Jul 2015 14:54:37 +0000 (14:54 +0000)]
Merge pull request #4147 from alalek:fix_world_cyclic_deps

9 years agoMerge pull request #4184 from alalek:fix_cmake_status
Alexander Alekhin [Tue, 14 Jul 2015 10:32:06 +0000 (10:32 +0000)]
Merge pull request #4184 from alalek:fix_cmake_status

9 years agoMerge pull request #4186 from ultrafro:fix_setDepthGeneratorProperty_registration_fla...
Alexander Alekhin [Mon, 13 Jul 2015 11:39:51 +0000 (11:39 +0000)]
Merge pull request #4186 from ultrafro:fix_setDepthGeneratorProperty_registration_flag_polarity

9 years agoFixed polarity of ImageRegistration mode in setDepthGeneratorProperty function of...
ultrafro [Sun, 12 Jul 2015 22:28:23 +0000 (18:28 -0400)]
Fixed polarity of ImageRegistration mode in setDepthGeneratorProperty function of CvCapture_OpenNI2 class

9 years agofix wrong usage of status(), remove useless message in videoio
Alexander Alekhin [Fri, 10 Jul 2015 16:18:07 +0000 (19:18 +0300)]
fix wrong usage of status(), remove useless message in videoio

9 years agoMerge pull request #4182 from vladimir-dudnik:update_dx_samples
Alexander Alekhin [Fri, 10 Jul 2015 14:30:03 +0000 (14:30 +0000)]
Merge pull request #4182 from vladimir-dudnik:update_dx_samples

9 years agosimplified sample's interface (remove odd "no processing" branch, add print to screen...
Vladimir Dudnik [Thu, 9 Jul 2015 19:41:05 +0000 (22:41 +0300)]
simplified sample's interface (remove odd "no processing" branch, add print to screen for processing mode)

9 years agoMerge pull request #4169 from alalek:issue_4457
Alexander Alekhin [Wed, 8 Jul 2015 14:30:41 +0000 (14:30 +0000)]
Merge pull request #4169 from alalek:issue_4457

9 years agoworkaround issue with MatExpr
Alexander Alekhin [Thu, 2 Jul 2015 14:44:32 +0000 (17:44 +0300)]
workaround issue with MatExpr

9 years agoissue 4457
Alexander Alekhin [Thu, 2 Jul 2015 12:10:12 +0000 (15:10 +0300)]
issue 4457

9 years agoMerge pull request #4154 from alalek:ffmpeg_update_via_binary_repo
Vadim Pisarevsky [Wed, 8 Jul 2015 12:23:13 +0000 (12:23 +0000)]
Merge pull request #4154 from alalek:ffmpeg_update_via_binary_repo

9 years agoMerge pull request #4171 from jet47:install-cudev-test
Vadim Pisarevsky [Wed, 8 Jul 2015 10:10:17 +0000 (10:10 +0000)]
Merge pull request #4171 from jet47:install-cudev-test

9 years agoMerge pull request #4174 from yangj1e:fix_svm_trainauto
Vadim Pisarevsky [Wed, 8 Jul 2015 10:04:40 +0000 (10:04 +0000)]
Merge pull request #4174 from yangj1e:fix_svm_trainauto

9 years agoMerge pull request #4158 from alalek:fix-bigdata-copyto
Vadim Pisarevsky [Wed, 8 Jul 2015 10:00:46 +0000 (10:00 +0000)]
Merge pull request #4158 from alalek:fix-bigdata-copyto

9 years agoMerge pull request #4173 from kalistratovag:mjpeg_encoder_coverity_warnings
Vadim Pisarevsky [Wed, 8 Jul 2015 09:19:01 +0000 (09:19 +0000)]
Merge pull request #4173 from kalistratovag:mjpeg_encoder_coverity_warnings

9 years agoMerge pull request #4159 from alalek:vector_processing
Alexander Alekhin [Mon, 6 Jul 2015 13:22:57 +0000 (13:22 +0000)]
Merge pull request #4159 from alalek:vector_processing

9 years agoMerge pull request #4172 from alalek:ocl_minmaxloc_unaligned
Vadim Pisarevsky [Mon, 6 Jul 2015 12:57:01 +0000 (12:57 +0000)]
Merge pull request #4172 from alalek:ocl_minmaxloc_unaligned

9 years agoocl: fix unaligned memory access
Alexander Alekhin [Fri, 3 Jul 2015 17:05:00 +0000 (20:05 +0300)]
ocl: fix unaligned memory access

http://code.opencv.org/issues/4462

9 years agoRemoving deadcode blocks, redudant variable & initializing all vars in constructor
kalistratovag [Fri, 3 Jul 2015 17:11:58 +0000 (20:11 +0300)]
Removing deadcode blocks, redudant variable & initializing all vars in constructor

Adding &31 to bit shift in order to silince coverity BAD_SHIFT defect

add default_stripes_count const

9 years agoFix SVM::trainAuto (Bug #4464)
Jie Yang [Sun, 5 Jul 2015 13:22:10 +0000 (22:52 +0930)]
Fix SVM::trainAuto (Bug #4464)

Fix SVM::trainAuto (Bug #4464)

9 years agoupdate ffmpeg wrapper binaries
Alexander Alekhin [Fri, 5 Jun 2015 09:39:56 +0000 (12:39 +0300)]
update ffmpeg wrapper binaries

Scripts are updated for Linux-based (Ubuntu 14.04) mingw cross-compilation (full stack of scripts provided)
Part of these scripts may work under Windows installation of MinGW, but it is not supported.

FFMPEG update: 2.7.1
Added OpenH264 Cisco binaries support for H264 encoding: v1.4.0

9 years agoadd opencv_test_cudev to installation package
Vladislav Vinogradov [Fri, 3 Jul 2015 10:33:36 +0000 (13:33 +0300)]
add opencv_test_cudev to installation package

9 years agoMerge pull request #4168 from Dikay900:export_threadcontrol
Alexander Alekhin [Thu, 2 Jul 2015 11:31:15 +0000 (11:31 +0000)]
Merge pull request #4168 from Dikay900:export_threadcontrol

9 years agoMerge pull request #4127 from avershov:opengl-opencl-sample
Alexander Alekhin [Thu, 2 Jul 2015 11:24:10 +0000 (11:24 +0000)]
Merge pull request #4127 from avershov:opengl-opencl-sample

9 years agofix copyTo memory corruption, but the main problem is still here
Alexander Alekhin [Wed, 1 Jul 2015 17:08:36 +0000 (20:08 +0300)]
fix copyTo memory corruption, but the main problem is still here

9 years agoexport thread control to python aswell
Dikay900 [Wed, 1 Jul 2015 20:55:12 +0000 (22:55 +0200)]
export thread control to python aswell

9 years agoMerge pull request #4167 from berak:patch-2
Vadim Pisarevsky [Wed, 1 Jul 2015 17:29:24 +0000 (17:29 +0000)]
Merge pull request #4167 from berak:patch-2

9 years agotest vector processing
Alexander Alekhin [Fri, 26 Jun 2015 10:35:27 +0000 (13:35 +0300)]
test vector processing

9 years agoMerge pull request #4164 from kalistratovag:parallel_mjpeg
Vadim Pisarevsky [Wed, 1 Jul 2015 14:15:51 +0000 (14:15 +0000)]
Merge pull request #4164 from kalistratovag:parallel_mjpeg

9 years agoremove legacy intermediate unused files
Alexander Alekhin [Thu, 18 Jun 2015 16:32:12 +0000 (19:32 +0300)]
remove legacy intermediate unused files

9 years agofix plausability check, #issue 4429
berak [Wed, 1 Jul 2015 13:32:37 +0000 (15:32 +0200)]
fix plausability check, #issue 4429

9 years agoMerge pull request #4117 from jaimefrio:relaxed_strides
Vadim Pisarevsky [Wed, 1 Jul 2015 10:53:45 +0000 (10:53 +0000)]
Merge pull request #4117 from jaimefrio:relaxed_strides

9 years agoMerge pull request #4064 from MSOpenTech:test-contrib
Vadim Pisarevsky [Wed, 1 Jul 2015 10:47:44 +0000 (10:47 +0000)]
Merge pull request #4064 from MSOpenTech:test-contrib

9 years agoMerge pull request #4166 from sbokov:fixingStereoBMissue
Vadim Pisarevsky [Wed, 1 Jul 2015 10:27:21 +0000 (10:27 +0000)]
Merge pull request #4166 from sbokov:fixingStereoBMissue

9 years agoMerge pull request #4139 from swook:spatial_gradient
Vadim Pisarevsky [Wed, 1 Jul 2015 10:22:36 +0000 (10:22 +0000)]
Merge pull request #4139 from swook:spatial_gradient

9 years agoMerge pull request #4094 from kashefy:Mat_push_back_MatExpr_bug_4340
Vadim Pisarevsky [Wed, 1 Jul 2015 09:09:51 +0000 (09:09 +0000)]
Merge pull request #4094 from kashefy:Mat_push_back_MatExpr_bug_4340

9 years agospatialGradient: Make kern args const&
Seon-Wook Park [Wed, 1 Jul 2015 00:34:27 +0000 (09:34 +0900)]
spatialGradient: Make kern args const&

9 years agoeliminated unused function __OpenCLinitializeGL(), simplified query device logic
Alexey Ershov [Tue, 30 Jun 2015 18:27:15 +0000 (21:27 +0300)]
eliminated unused function __OpenCLinitializeGL(), simplified query device logic

9 years agospatialGradient: Add CV_SSE2 check
Seon-Wook Park [Tue, 30 Jun 2015 15:42:08 +0000 (00:42 +0900)]
spatialGradient: Add CV_SSE2 check

9 years agoFixing uninitialized memory access problem
sbokov [Tue, 30 Jun 2015 15:16:56 +0000 (18:16 +0300)]
Fixing uninitialized memory access problem

9 years agoAdding test support for WINRT
Evgeny Agafonchikov [Mon, 18 May 2015 08:57:18 +0000 (11:57 +0300)]
Adding test support for WINRT

9 years agoImplementing parallel mjpeg encoder.
kalistratovag [Mon, 29 Jun 2015 17:08:08 +0000 (20:08 +0300)]
Implementing parallel mjpeg encoder.
Fixed errors in parallel_for based on pthreads

Fixing compiler errore & removing whitespaces

Fixing prallel_for_pthreads error and warnings on win

9 years agoadd unit test around Mat::push_back()
Youssef Kashef [Fri, 5 Jun 2015 09:46:16 +0000 (11:46 +0200)]
add unit test around Mat::push_back()

add template specialization Mat::push_back() for MatExpr paramters

extend push_back MatExpr to mat in unit test

cast to object instead of reference

test with multi-row MatExpr input

9 years agospatialGradient: Remove 4 loads in inner loop
Seon-Wook Park [Tue, 30 Jun 2015 07:08:15 +0000 (16:08 +0900)]
spatialGradient: Remove 4 loads in inner loop

9 years agoMerge pull request #4153 from stefan-cornelius:master
Vadim Pisarevsky [Tue, 30 Jun 2015 06:12:03 +0000 (06:12 +0000)]
Merge pull request #4153 from stefan-cornelius:master

9 years agospatialGradient: Remove pointers caching
Seon-Wook Park [Tue, 30 Jun 2015 01:51:10 +0000 (10:51 +0900)]
spatialGradient: Remove pointers caching

9 years agoMerge pull request #4150 from alalek:opencv_org_issue_4428
Alexander Alekhin [Mon, 29 Jun 2015 17:08:54 +0000 (17:08 +0000)]
Merge pull request #4150 from alalek:opencv_org_issue_4428

9 years agospatialGradient: Change ordering of vector loads
Seon-Wook Park [Mon, 29 Jun 2015 14:50:05 +0000 (23:50 +0900)]
spatialGradient: Change ordering of vector loads

9 years agospatialGradient: L/R border handling outside. Kernelize.
Seon-Wook Park [Mon, 29 Jun 2015 14:12:33 +0000 (23:12 +0900)]
spatialGradient: L/R border handling outside. Kernelize.

9 years agoMerge pull request #4155 from MSOpenTech:highgui_contrib
Vadim Pisarevsky [Mon, 29 Jun 2015 12:44:16 +0000 (12:44 +0000)]
Merge pull request #4155 from MSOpenTech:highgui_contrib

9 years agoMerge pull request #4161 from alalek:restore_data_file
Vadim Pisarevsky [Mon, 29 Jun 2015 12:32:35 +0000 (12:32 +0000)]
Merge pull request #4161 from alalek:restore_data_file

9 years agofixed cleanup, fixed unused context
Alexey Ershov [Mon, 29 Jun 2015 08:46:31 +0000 (11:46 +0300)]
fixed cleanup, fixed unused context

9 years agospatialGradient: Move vector decl into loop
Seon-Wook Park [Sat, 27 Jun 2015 08:01:47 +0000 (10:01 +0200)]
spatialGradient: Move vector decl into loop

9 years agospatialGradient: Re-introduce 2-rows at a time
Seon-Wook Park [Sat, 27 Jun 2015 07:53:42 +0000 (09:53 +0200)]
spatialGradient: Re-introduce 2-rows at a time

9 years agospatialGradient: Suppress uninitialised j warnings
Seon-Wook Park [Fri, 26 Jun 2015 23:03:43 +0000 (01:03 +0200)]
spatialGradient: Suppress uninitialised j warnings

9 years agoUpdated sample to showcase highgui WinRT usage
Maxim Kostin [Thu, 25 Jun 2015 15:22:46 +0000 (18:22 +0300)]
Updated sample to showcase highgui WinRT usage

Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
9 years agoAdded support for highgui module on WinRT 8.1+
Maxim Kostin [Fri, 26 Jun 2015 20:41:25 +0000 (23:41 +0300)]
Added support for highgui module on WinRT 8.1+

Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
9 years agomerge to resolve conflict
Alexander Alekhin [Fri, 26 Jun 2015 16:10:58 +0000 (19:10 +0300)]
merge to resolve conflict

Conflicts:
samples/data/detect_blob.png

9 years agoreplacement for #4160
Alexander Alekhin [Fri, 26 Jun 2015 15:45:58 +0000 (18:45 +0300)]
replacement for #4160

9 years agospatialGradient: Process 1 row at a time in SSE
Seon-Wook Park [Fri, 26 Jun 2015 15:35:17 +0000 (17:35 +0200)]
spatialGradient: Process 1 row at a time in SSE

9 years agospatialGradient: Remove an unnecessary branch in nosse code
Seon-Wook Park [Fri, 26 Jun 2015 15:26:21 +0000 (17:26 +0200)]
spatialGradient: Remove an unnecessary branch in nosse code

9 years agospatialGradient: Don't dynamically alloc C array, use vector
Seon-Wook Park [Fri, 26 Jun 2015 15:15:44 +0000 (17:15 +0200)]
spatialGradient: Don't dynamically alloc C array, use vector

9 years agospatialGradient: Make nosse version faster
Seon-Wook Park [Fri, 26 Jun 2015 15:13:23 +0000 (17:13 +0200)]
spatialGradient: Make nosse version faster

9 years agospatialGradient: HAL-accelerated
Seon-Wook Park [Fri, 26 Jun 2015 14:41:00 +0000 (16:41 +0200)]
spatialGradient: HAL-accelerated

TODO: Make nosse ver faster than Sobel
      Make sse ver faster than Sobel for BORDER_REPLICATE

9 years agoSupport non continuous, BORDER_REPLICATE
Seon-Wook Park [Fri, 26 Jun 2015 12:49:31 +0000 (14:49 +0200)]
Support non continuous, BORDER_REPLICATE

TODO: HAL-accelerated code

9 years agoOpenGL OpenCL sample
Alexey Ershov [Mon, 1 Jun 2015 15:16:22 +0000 (18:16 +0300)]
OpenGL OpenCL sample

057cd52 first versions: cv::ogl::convertFromGLTexture2D & cv::ogl::convertToGLTexture2D
5656e94 added autogenerated stuff for cl_gl.h
765f1fd resolved CL functions in opengl.cpp
9f9fee3 implemented function cv::ogl::ocl::initializeContextFromGLTexture2D()
a792adb cv::ogl::ocl::initializeContextFromGLTexture2D() - added linux support (glx.h)
51c2869 added missing error message in function cv::ogl::ocl::initializeContextFromGLTexture2D()
513b887 fixed extension call in function cv::ogl::ocl::initializeContextFromGLTexture2D()
475a3e9 added CL-GL interop Windows sample (gpu/opengl_interop.cpp)
07af28f added building of CL-GL interop sample - Windows only
befe3a2 fixed whitespace errors & doxygen warnings (precommit_docs)
551251a changed function name to cv::ogl::ocl::initializeContextFromGL(), removed unused argument
4d5f009 changed CL_DEVICES_FOR_GL_CONTEXT_KHR to CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR
9fc3055 changed CL_DEVICES_FOR_GL_CONTEXT_KHR to CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KH
6d31cee Revert "changed CL_DEVICES_FOR_GL_CONTEXT_KHR to CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KH"
cc6a025 added texture format check in cv::ogl::convertFromGLTexture2D()
063a2c1 CL-GL sample: added Linux implementation (Xlib/GLX)
c392ae9 fixed trailing whitespace
85a80d0 fixed include files
ae23628 excluded samples/opengl from build case 2
9870ea5 added android EGL support
530b64c added doxygen documentation comments to CL-GL interop functions

9 years agoocl: autogenerated files for cl_gl.h
Alexander Alekhin [Wed, 10 Jun 2015 11:15:34 +0000 (14:15 +0300)]
ocl: autogenerated files for cl_gl.h

9 years agoocl: update generator scripts
Alexander Alekhin [Wed, 10 Jun 2015 11:09:24 +0000 (14:09 +0300)]
ocl: update generator scripts

9 years agoFix processing of SunRaster images with negative maplength
scorneli [Wed, 24 Jun 2015 22:13:38 +0000 (00:13 +0200)]
Fix processing of SunRaster images with negative maplength

9 years agocopyTo: fix for big data (4Gb+)
Alexander Alekhin [Thu, 25 Jun 2015 16:59:27 +0000 (19:59 +0300)]
copyTo: fix for big data (4Gb+)

9 years agoMerge pull request #4156 from mshabunin:fix-neon-intrin
Alexander Alekhin [Thu, 25 Jun 2015 17:52:14 +0000 (17:52 +0000)]
Merge pull request #4156 from mshabunin:fix-neon-intrin

9 years agoMerge pull request #4124 from ruslo:android.fix
Alexander Alekhin [Thu, 25 Jun 2015 17:16:04 +0000 (17:16 +0000)]
Merge pull request #4124 from ruslo:android.fix

9 years agoMerge pull request #4105 from jayceelock:master
Alexander Alekhin [Thu, 25 Jun 2015 17:13:02 +0000 (17:13 +0000)]
Merge pull request #4105 from jayceelock:master

9 years agoFixed transpose intrinsic prefix for NEON
Maksim Shabunin [Thu, 25 Jun 2015 15:19:23 +0000 (18:19 +0300)]
Fixed transpose intrinsic prefix for NEON

9 years agoFix processing of SunRaster images with negative maplength
Stefan Cornelius [Wed, 24 Jun 2015 22:17:49 +0000 (00:17 +0200)]
Fix processing of SunRaster images with negative maplength

9 years agoMerge pull request #4151 from lupustr3:pvlasov/ipp_alignment
Alexander Alekhin [Wed, 24 Jun 2015 16:45:13 +0000 (16:45 +0000)]
Merge pull request #4151 from lupustr3:pvlasov/ipp_alignment

9 years agoMerge pull request #4135 from lupustr3:ipp_code_refactoring
Vadim Pisarevsky [Wed, 24 Jun 2015 16:18:54 +0000 (16:18 +0000)]
Merge pull request #4135 from lupustr3:ipp_code_refactoring

9 years agoMerge pull request #4152 from mshabunin:fix-cuda-build
Maksim Shabunin [Wed, 24 Jun 2015 15:31:59 +0000 (15:31 +0000)]
Merge pull request #4152 from mshabunin:fix-cuda-build

9 years agoFixed build with CUDA
Maksim Shabunin [Wed, 24 Jun 2015 13:05:08 +0000 (16:05 +0300)]
Fixed build with CUDA

9 years agoAccidentally removed tegra checks were returned;
Pavel Vlasov [Wed, 24 Jun 2015 11:55:45 +0000 (14:55 +0300)]
Accidentally removed tegra checks were returned;

9 years agoWarning fix;
Pavel Vlasov [Wed, 24 Jun 2015 11:34:20 +0000 (14:34 +0300)]
Warning fix;

9 years agoImgproc_Hist_MinMaxVal.accuracy fix;
Pavel Vlasov [Wed, 24 Jun 2015 10:50:17 +0000 (13:50 +0300)]
Imgproc_Hist_MinMaxVal.accuracy fix;
Some code style corrections;

9 years agoProper IPP alignment;
Pavel Vlasov [Wed, 24 Jun 2015 06:21:35 +0000 (09:21 +0300)]
Proper IPP alignment;

9 years agoimplement singleton lazy initialization
Alexander Alekhin [Tue, 23 Jun 2015 11:31:01 +0000 (14:31 +0300)]
implement singleton lazy initialization

9 years agoMerge pull request #4146 from LaurentBerger:MvDetectBlobPNG
Vadim Pisarevsky [Tue, 23 Jun 2015 11:19:39 +0000 (11:19 +0000)]
Merge pull request #4146 from LaurentBerger:MvDetectBlobPNG

9 years agofix cyclic deps error (world,shared)
Alexander Alekhin [Mon, 22 Jun 2015 17:14:30 +0000 (20:14 +0300)]
fix cyclic deps error (world,shared)

9 years agomove data/detect_blob.png in samples/data
LaurentBerger [Mon, 22 Jun 2015 15:51:01 +0000 (17:51 +0200)]
move data/detect_blob.png in samples/data

9 years agoMerge pull request #4111 from mshabunin:fix-flann-access
Vadim Pisarevsky [Mon, 22 Jun 2015 11:53:32 +0000 (11:53 +0000)]
Merge pull request #4111 from mshabunin:fix-flann-access

9 years agoMerge pull request #4142 from sturkmen72:patch-2
Vadim Pisarevsky [Mon, 22 Jun 2015 11:51:39 +0000 (11:51 +0000)]
Merge pull request #4142 from sturkmen72:patch-2

9 years agoMerge pull request #4136 from alalek:fix_matallocator_destruction
Vadim Pisarevsky [Mon, 22 Jun 2015 11:49:36 +0000 (11:49 +0000)]
Merge pull request #4136 from alalek:fix_matallocator_destruction

9 years agoFixed gen_pattern.py file permission back to 755
jayceelock [Mon, 22 Jun 2015 06:41:44 +0000 (08:41 +0200)]
Fixed gen_pattern.py file permission back to 755

9 years agoMerge pull request #4140 from mshabunin:fix-java-package
Alexander Alekhin [Sat, 20 Jun 2015 14:20:54 +0000 (14:20 +0000)]
Merge pull request #4140 from mshabunin:fix-java-package

9 years agoMerge pull request #4143 from Dikay900:ffmpeg_dict
Alexander Alekhin [Sat, 20 Jun 2015 14:19:51 +0000 (14:19 +0000)]
Merge pull request #4143 from Dikay900:ffmpeg_dict

9 years agoUpdate mat.hpp
Suleyman TURKMEN [Sat, 20 Jun 2015 08:18:47 +0000 (11:18 +0300)]
Update mat.hpp

spelling corrections

9 years agofix one dict parameter in ffmpeg implementation (introduced while porting)
Dikay900 [Sat, 20 Jun 2015 08:17:34 +0000 (10:17 +0200)]
fix one dict parameter in ffmpeg implementation (introduced while porting)