1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00

Merge pull request #12458 from DEEPIR:3.4

* may be an typo fix

* remove identical branch,may be paste error

* add parentheses around macro parameter

* simplify if condition

* check malloc fail

* change the condition of branch removed by commit 3041502861
This commit is contained in:
cyy
2018-09-07 23:43:47 +08:00
committed by Alexander Alekhin
parent 875de75327
commit 286c2c236b
8 changed files with 11 additions and 9 deletions
+2
View File
@@ -715,6 +715,8 @@ static int LockCallBack(void **mutex, AVLockOp op)
{
case AV_LOCK_CREATE:
localMutex = reinterpret_cast<ImplMutex*>(malloc(sizeof(ImplMutex)));
if (!localMutex)
return 1;
localMutex->init();
*mutex = localMutex;
if (!*mutex)