Merge pull request #438 from bitwangyaoyao:2.4_fixwarings
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 6 Feb 2013 10:04:27 +0000 (14:04 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 6 Feb 2013 10:04:28 +0000 (14:04 +0400)
1  2 
modules/ocl/src/pyrlk.cpp

Simple merge