Roman Donchenko
|
983e75e5de
|
Merge remote-tracking branch 'origin/master' into merge-2.4
|
2014-08-01 15:01:41 +04:00 |
|
Vadim Pisarevsky
|
18de8dee62
|
Merge pull request #3009 from vpisarev:ios_experiments
|
2014-07-31 18:20:07 +00:00 |
|
Vadim Pisarevsky
|
4dfb613c3e
|
optimized Bayer=>RGB/RGBA/Gray conversion using Neon intrinsics. Fixed recently introduced build error in iOS framework.
|
2014-07-28 14:54:41 +04:00 |
|
Sander Mathijs van Veen
|
facb2f9a81
|
Reset class members to NULL after gst_*_unref()
|
2014-07-23 19:15:16 +02:00 |
|
Sander Mathijs van Veen
|
f8442da945
|
Initialize all pointers of CvCapture_GStreamer correctly
|
2014-07-23 14:41:17 +02:00 |
|
Vadim Pisarevsky
|
7bd7c85b1d
|
Merge pull request #2919 from larshg:Openni2Support
|
2014-07-23 11:23:48 +00:00 |
|
VBystricky
|
cc703b01df
|
Fix build errors with cap_v4l on Linux
|
2014-07-20 18:27:14 +04:00 |
|
Lars Glud
|
1242a66119
|
Openni2 support
|
2014-07-20 15:04:11 +02:00 |
|
Lars Glud
|
4dcd37f699
|
Merge remote-tracking branch 'origin/master' into Openni2Support
Conflicts:
modules/highgui/CMakeLists.txt
modules/highgui/include/opencv2/highgui.hpp
modules/highgui/include/opencv2/highgui/highgui_c.h
|
2014-07-20 14:28:10 +02:00 |
|
VBystricky
|
ca307669d4
|
Refresh code. Fix merge conflict
|
2014-07-14 23:30:50 +04:00 |
|
vbystricky
|
d58f736935
|
Split highgui module to videoio and highgui
|
2014-07-14 23:16:47 +04:00 |
|