projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46d218b 7d9a480)
Merge pull request #6358 from alalek:ffmpeg_fix_timeout
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 5 Apr 2016 11:07:00 +0000 (11:07 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 5 Apr 2016 11:07:00 +0000 (11:07 +0000)

Trivial merge
Domain: Multimedia / Media Vision;