Merge pull request #1516 from akarsakov:new_ffmpeg_build
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 17 Oct 2013 11:41:15 +0000 (15:41 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 17 Oct 2013 11:41:18 +0000 (15:41 +0400)
commit9c7ba848bbc9bc211f43bed65c3ea2bd6b00cc5c
tree22f79b4578b754087627f946a1e37cda124b3ff0
parentd411041c5356e6fad9bae10354b5fe684886b8e6
parentcee308312a90df5cf1fdd03b640736cb80a32321
Merge pull request #1516 from akarsakov:new_ffmpeg_build