Merge pull request #197 from asmorkalov:ffmpeg_status_message_fix
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 4 Dec 2012 17:02:10 +0000 (21:02 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 4 Dec 2012 17:02:10 +0000 (21:02 +0400)

Trivial merge