Simple set of the camera index to allow the user to change it after the object has been initialized.
Fix the mismatch on NV GPUs
Merge pull request #905 from bitwangyaoyao:2.4_TVL1
Fixed include name in OpenCL on OS X
Merge pull request #904 from ograycode:2.4
fix pyrLK's mismatch on Intel GPUs
fix Linux build errors
fix hog
A new python sample on grabcut
Bug #2960 : docs about CV_BGR2GRAY
ANDed waitkey result with 0xFF for x64 systems
Fix some OpenCL kernel file build errors on Mac.
fix memory leak
Merge pull request #923 from pengx17:2.4_macfix
Merge pull request #919 from abidrahmank:2.4
Merge pull request #916 from bitwangyaoyao:2.4_fixPyrLK
Merge pull request #913 from janm399:2.4
Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_oclgfft