X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg.h;h=961f5cbb1e2b259b8d205ceb93e808bc0867e767;hb=6904ca547ce503c9ea06b4def9b9a716068e493c;hp=1d2c312e6d528c181ec8e5ee3d9ef6c1566bf95f;hpb=3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0;p=dcpomatic.git

diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index 1d2c312e6..961f5cbb1 100644
--- a/src/lib/ffmpeg.h
+++ b/src/lib/ffmpeg.h
@@ -20,25 +20,20 @@
 #ifndef DCPOMATIC_FFMPEG_H
 #define DCPOMATIC_FFMPEG_H
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread/mutex.hpp>
+#include "file_group.h"
+#include "ffmpeg_subtitle_period.h"
 extern "C" {
 #include <libavcodec/avcodec.h>
 }
-#include "file_group.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/thread/mutex.hpp>
 
-struct AVFilterGraph;
-struct AVCodecContext;
-struct AVFilterContext;
 struct AVFormatContext;
 struct AVFrame;
-struct AVBufferContext;
-struct AVCodec;
-struct AVStream;
 struct AVIOContext;
 
 class FFmpegContent;
+class Log;
 
 class FFmpeg
 {
@@ -55,15 +50,16 @@ public:
 
 protected:
 	AVCodecContext* video_codec_context () const;
-	AVCodecContext* audio_codec_context () const;
-	
+	AVCodecContext* subtitle_codec_context () const;
+	static FFmpegSubtitlePeriod subtitle_period (AVSubtitle const &);
+
 	boost::shared_ptr<const FFmpegContent> _ffmpeg_content;
 
 	uint8_t* _avio_buffer;
 	int _avio_buffer_size;
 	AVIOContext* _avio_context;
 	FileGroup _file_group;
-	
+
 	AVFormatContext* _format_context;
 	AVPacket _packet;
 	AVFrame* _frame;
@@ -80,6 +76,9 @@ protected:
 private:
 	void setup_general ();
 	void setup_decoders ();
+
+	static void ffmpeg_log_callback (void* ptr, int level, const char* fmt, va_list vl);
+	static boost::weak_ptr<Log> _ffmpeg_log;
 };
 
 #endif