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)
commit7d4a8bc437be8945c15d89abf564be663b7101f4
tree6ac355d7e1aee09a3045c72556b24fa244d1f468
parent46d218bcec77140c1d29028d7a77b5e4371dd8d4
parent7d9a4805978394176eefbc4e53821fc862ed39cf
Merge pull request #6358 from alalek:ffmpeg_fix_timeout