From 528c48e4e9d38b4fe267d0a975b6bf32d969c211 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 2 May 2014 18:04:01 +0100 Subject: Revert "Hack around crash on exist of tests due to race between ~FFmpeg and __cxa_finalize." This reverts commit fde38b664c98205dd4fe3721b125469d5dd2ecbe. --- src/lib/ffmpeg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/ffmpeg.h') diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h index 04be4873a..760918437 100644 --- a/src/lib/ffmpeg.h +++ b/src/lib/ffmpeg.h @@ -75,7 +75,7 @@ protected: a mutex around calls to avcodec_open* and avcodec_close... and here it is. */ - static boost::mutex* _mutex; + static boost::mutex _mutex; private: void setup_general (); -- cgit v1.2.3