Merge pull request #1799 from SpecLad:avformat-53-6
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 15 Nov 2013 07:51:59 +0000 (11:51 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 15 Nov 2013 07:51:59 +0000 (11:51 +0400)

Trivial merge