[opencv] 88/251: Merge pull request #9091 from alalek:update_ffmpeg

[Nobuhiro Iwamatsu]

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

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

commit 49e1f6b161a1c8267b6f40f750087cd6b60f4db6
Merge: 1a4c22f 6833b46
Author: Alexander Alekhin <alexander.a.alekhin at gmail.com>
Date:   Fri Jul 14 17:25:35 2017 +0000

    Merge pull request #9091 from alalek:update_ffmpeg

 3rdparty/ffmpeg/ffmpeg.cmake         | 12 ++++++------
 3rdparty/ffmpeg/readme.txt           |  9 ++++-----
 modules/videoio/test/test_ffmpeg.cpp |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

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