[opencv] 75/98: Merge pull request #6363 from alalek:ffmpeg_fix_timeout_24

[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 52ba3778e3742afb42cd68b4f7c38098194bd2ad
Merge: c7b6353 6f139b4
Author: Alexander Alekhin <alexander.alekhin at itseez.com>
Date:   Tue Apr 5 16:29:15 2016 +0000

    Merge pull request #6363 from alalek:ffmpeg_fix_timeout_24

 modules/highgui/src/cap_ffmpeg_impl.hpp | 70 ++++++++++++++++++++++++---------
 1 file changed, 52 insertions(+), 18 deletions(-)

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