Merge pull request #1691 from SpecLad:ffmpeg-test
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 28 Oct 2013 15:35:08 +0000 (19:35 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 28 Oct 2013 15:35:08 +0000 (19:35 +0400)

Trivial merge