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)
commit529f086b626800b6c70682c3c67475d0e544cf7c
tree1118873e8c61e5cd5e55c21716d1dc90781e07d4
parent766a3511c65c7fe934719fc361e92e3d83f0f786
parent36b5180aa186776e5fc7f7df6fff5b49da185f23
Merge pull request #1691 from SpecLad:ffmpeg-test