[opencv] 43/98: Merge pull request #6199 from alalek:ffmpeg_backport

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to annotated tag 2.4.13
in repository opencv.

commit ea049e147d093e2ba1e071e1f644a6af9d05de52
Merge: 60f73ee a61b19b
Author: Alexander Alekhin <alexander.alekhin at itseez.com>
Date:   Thu Mar 3 17:25:32 2016 +0000

    Merge pull request #6199 from alalek:ffmpeg_backport

 modules/highgui/src/cap_ffmpeg_impl.hpp | 364 +++++++++++++++++++++++++++-----
 1 file changed, 314 insertions(+), 50 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git