Merge pull request #1784 from SpecLad:ffmpeg-no-png
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 13 Nov 2013 11:52:42 +0000 (15:52 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 13 Nov 2013 11:52:42 +0000 (15:52 +0400)

Trivial merge