Merge pull request #756 from taka-no-me:libavcodec53.25.0
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 4 Apr 2013 13:57:16 +0000 (17:57 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 4 Apr 2013 13:57:17 +0000 (17:57 +0400)

Trivial merge