Merge pull request #1655 from pengx17:2.4_opt_superres_ocl
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 25 Oct 2013 15:47:38 +0000 (19:47 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 25 Oct 2013 15:47:38 +0000 (19:47 +0400)
commit66e5be2d64743562f851eced33be2c5ff0716200
tree060a2dc4f65b543efa5b06d919b3ef8439522227
parentfc64a4071c7d5ed04c118c70264a0040a12a6487
parent7285341083a1210db1485eee1075540fa5ebc884
Merge pull request #1655 from pengx17:2.4_opt_superres_ocl
modules/ocl/src/optical_flow_farneback.cpp
modules/superres/src/opencl/superres_btvl1.cl