[opencv] 23/89: Merge pull request #7655 from alalek:backport_7213

[Nobuhiro Iwamatsu]

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

iwamatsu pushed a commit to annotated tag 2.4.13.2
in repository opencv.

commit 8f4251fbfab1183e204de2c4105df71af3f619b3
Merge: f632f5c 64a2d19
Author: Alexander Alekhin <alexander.a.alekhin at gmail.com>
Date:   Mon Nov 14 13:42:31 2016 +0000

    Merge pull request #7655 from alalek:backport_7213

 modules/highgui/src/cap_ffmpeg_impl.hpp | 4 ++++
 1 file changed, 4 insertions(+)

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