Merge pull request #3272 from mgeorg:reset_ffmpeg_mutex_2_4

pull/3281/head
Maksim Shabunin 11 years ago
commit a160158cb3
  1. 1
      modules/highgui/src/cap_ffmpeg_impl.hpp

@ -485,6 +485,7 @@ static int LockCallBack(void **mutex, AVLockOp op)
localMutex->destroy(); localMutex->destroy();
free(localMutex); free(localMutex);
localMutex = NULL; localMutex = NULL;
*mutex = NULL;
break; break;
} }
return 0; return 0;

Loading…
Cancel
Save