diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-02 18:04:01 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-02 18:04:01 +0100 |
| commit | 528c48e4e9d38b4fe267d0a975b6bf32d969c211 (patch) | |
| tree | 63b746b19b0046e2cf678e493aa40106d1441710 /src/lib/ffmpeg.h | |
| parent | fde38b664c98205dd4fe3721b125469d5dd2ecbe (diff) | |
Revert "Hack around crash on exist of tests due to race between ~FFmpeg and __cxa_finalize."
This reverts commit fde38b664c98205dd4fe3721b125469d5dd2ecbe.
Diffstat (limited to 'src/lib/ffmpeg.h')
| -rw-r--r-- | src/lib/ffmpeg.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 (); |