Fix crashes on x-thread signal emission.

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

diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index 182ee634b4aadfc6c0e1c5c21f549f9346943c74..6dd9da0dc4efb9f571ec76629ed7c6953ebd2d6d 100644 (file)
--- a/src/lib/ffmpeg.h
+++ b/src/lib/ffmpeg.h
@@ -20,13 +20,13 @@
 #ifndef DCPOMATIC_FFMPEG_H
 #define DCPOMATIC_FFMPEG_H
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread/mutex.hpp>
 extern "C" {
 #include <libavcodec/avcodec.h>
 }
 #include "file_group.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/thread/mutex.hpp>
+#include <vector>
 
 struct AVFilterGraph;
 struct AVCodecContext;
@@ -43,7 +43,7 @@ class FFmpegContent;
 class FFmpeg
 {
 public:
-       FFmpeg (boost::shared_ptr<const FFmpegContent>, bool);
+       FFmpeg (boost::shared_ptr<const FFmpegContent>);
        virtual ~FFmpeg ();
 
        boost::shared_ptr<const FFmpegContent> ffmpeg_content () const {
@@ -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;
 
@@ -67,7 +68,8 @@ protected:
        AVFormatContext* _format_context;
        AVPacket _packet;
        AVFrame* _frame;
-       
+
+       /** Index of video stream within AVFormatContext */
        int _video_stream;
 
        /* It would appear (though not completely verified) that one must have
@@ -77,9 +79,8 @@ protected:
        static boost::mutex _mutex;
 
 private:
-       void setup_general (bool);
-       void setup_video ();
-       void setup_audio ();
+       void setup_general ();
+       void setup_decoders ();
 };
 
 #endif