Merge pull request #480 from taka-no-me:ffmpeg_warnings
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 12 Feb 2013 16:29:02 +0000 (20:29 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 12 Feb 2013 16:29:03 +0000 (20:29 +0400)

Trivial merge