projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c4ed7f c09b600)
Merge pull request #6074 from alalek:ffmpeg_interrupt_callback_compatibility
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 11 Feb 2016 15:00:52 +0000 (15:00 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 11 Feb 2016 15:00:52 +0000 (15:00 +0000)

Trivial merge
Domain: Multimedia / Media Vision;