X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg.h;h=8aaa54f84afab6973938e83eb138a60d6a2fa9c3;hb=6de35d058821acc092d2aae75543024a97026b8a;hp=04be4873a35f68078e6bfb08d2da5ccb2d324f81;hpb=fde38b664c98205dd4fe3721b125469d5dd2ecbe;p=dcpomatic.git

diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index 04be4873a..8aaa54f84 100644
--- a/src/lib/ffmpeg.h
+++ b/src/lib/ffmpeg.h
@@ -56,6 +56,7 @@ public:
 protected:
 	AVCodecContext* video_codec_context () const;
 	AVCodecContext* audio_codec_context () const;
+	AVCodecContext* subtitle_codec_context () const;
 	
 	boost::shared_ptr<const FFmpegContent> _ffmpeg_content;
 
@@ -75,12 +76,11 @@ 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 ();
-	void setup_video ();
-	void setup_audio ();
+	void setup_decoders ();
 };
 
 #endif