Merge pull request #3272 from mgeorg:reset_ffmpeg_mutex_2_4

2014-09-29 12:07:22 +00:00 · 2014-09-29 12:07:22 +00:00 · a160158cb3
commit a160158cb3
parent 6a53cb9307 7f4eb4f6c6
1 changed files with 1 additions and 0 deletions
--- a/modules/highgui/src/cap_ffmpeg_impl.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
@ -485,6 +485,7 @@ static int LockCallBack(void **mutex, AVLockOp op)
            localMutex->destroy();
            free(localMutex);
            localMutex = NULL;
+            *mutex = NULL;
        break;
    }
    return 0;