[opencv] 11/71: Merge pull request #6689 from ilya-lavrenov:il/fix

[Nobuhiro Iwamatsu]

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

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

commit aa861520f6ef0221dcb4034f55e310d000ed9800
Merge: 77849d0 e0d64df
Author: Alexander Alekhin <alexander.alekhin at itseez.com>
Date:   Thu Jun 16 11:39:20 2016 +0000

    Merge pull request #6689 from ilya-lavrenov:il/fix

 modules/highgui/src/cap_ffmpeg_impl.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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