Merge pull request #2011 from ilya-lavrenov:dft_dct
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 18 Dec 2013 13:36:18 +0000 (17:36 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 18 Dec 2013 13:36:18 +0000 (17:36 +0400)

Trivial merge