Merge pull request #1516 from akarsakov:new_ffmpeg_build
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 17 Oct 2013 11:41:15 +0000 (15:41 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 17 Oct 2013 11:41:18 +0000 (15:41 +0400)

Trivial merge