[opencv] 21/53: Merge pull request #8353 from lpetre:backport_3593

[Nobuhiro Iwamatsu]

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

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

commit ec784331fb43fbd531f3d929e614e1bcc5469427
Merge: d856604 61936eb
Author: Alexander Alekhin <alexander.a.alekhin at gmail.com>
Date:   Mon Mar 13 10:01:07 2017 +0000

    Merge pull request #8353 from lpetre:backport_3593
    
    backport of PR #3593

 modules/core/src/parallel.cpp           | 2 +-
 modules/core/src/system.cpp             | 2 --
 modules/highgui/src/cap_ffmpeg_impl.hpp | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

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