Merge pull request #6363 from alalek:ffmpeg_fix_timeout_24
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 5 Apr 2016 16:29:15 +0000 (16:29 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 5 Apr 2016 16:29:15 +0000 (16:29 +0000)
commit52ba3778e3742afb42cd68b4f7c38098194bd2ad
treeee3f7b31d1d2423f8f8d3112207da7649ec15003
parentc7b6353a3c4170205e523562832f5df89a792fee
parent6f139b4f8e604237bd4113557830435e540773fd
Merge pull request #6363 from alalek:ffmpeg_fix_timeout_24