Alexander Alekhin 67a734ce73 Merge branch '2.4' into master ...

Commits:
67fe57a add fixed video
db0ae2c Restore 2.4 source branch for bug fix 6317.
97ac59c Fix a memory leak indirectly caused by cvDestroyWindow
eb40afa Add a workaround for FFmpeg's color conversion accessing past the end of the buffer
421fcf9 Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability
912592d Remove "INSTALL_NAME_DIR lib" target property
bb1c2d7 fix bug on border at pyrUp

2016-04-21 20:15:08 +03:00

..

android

android samples: force setVisibility (see #5812)

2015-12-16 14:31:49 +03:00

cpp

Updates for XCode 7.3

2016-04-17 20:21:29 +03:00

data

Merge branch '2.4' into master

2016-04-21 20:15:08 +03:00

directx

fixed not initialized nv12_cpu_copy surface, remove odd code

2015-08-01 02:10:05 +03:00

gpu

gpu samples: fix REMOVE_ITEM error

2015-12-31 02:24:54 +03:00

hal

Using find_package to import custom HAL library

2016-03-24 17:05:54 +03:00

java

Change SURF to ORB in Java-Sbt sample to remove dependency on external non-free modules

2015-09-03 17:16:59 +03:00

opencl

warning fix (MSVS2015)

2015-12-12 15:23:31 +03:00

opengl

used proper method

2015-08-17 01:44:50 +03:00

python

Merge pull request #6344 from anatolix:kalmanpyfix

2016-04-12 15:55:55 +00:00

tapi

Feature #3957

2015-12-17 18:19:39 +03:00

va_intel

changed device detection procedure, added resizing surface to bigger size

2015-09-23 17:35:49 +03:00

winrt

Updated sample to showcase highgui WinRT usage

2015-06-26 23:41:39 +03:00

winrt_universal

Adding backslash in macro-based paths

2015-05-29 09:36:42 +03:00

wp8

Adding backslash in macro-based paths

2015-05-29 09:36:42 +03:00

CMakeLists.txt

change links from samples/python2 to samples/python

2015-12-18 11:00:30 +03:00