projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 220bb14 3f26667)
Merge pull request #4100 from alalek:fix_ffmpeg
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 17 Jun 2015 11:29:32 +0000 (11:29 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 17 Jun 2015 11:29:33 +0000 (11:29 +0000)

Trivial merge
Domain: Multimedia / Media Vision;