Merge master.

[dcpomatic.git] / src / lib / ffmpeg.h

diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index 04be4873a35f68078e6bfb08d2da5ccb2d324f81..760918437d403dd0624984e31a07fb0bdddff583 100644 (file)
--- 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 ();