Merge pull request #347 from asmorkalov:WITH_FFMPEG_logic
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 29 Jan 2013 10:00:09 +0000 (14:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 29 Jan 2013 10:00:10 +0000 (14:00 +0400)

Trivial merge