X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_file_encoder.h;h=fd716d47c4a3f980b7cc7d057b41e29c65bdafd8;hp=8a727106a7fe44194ceb72b957ea0cff4b0ce7c7;hb=59209af1e2d73334ff7dfe6c7da465293dc24c0b;hpb=33e13c4053138930f4b2f59349e441c76111059d

diff --git a/src/lib/ffmpeg_file_encoder.h b/src/lib/ffmpeg_file_encoder.h
index 8a727106a..fd716d47c 100644
--- a/src/lib/ffmpeg_file_encoder.h
+++ b/src/lib/ffmpeg_file_encoder.h
@@ -23,20 +23,32 @@
 #define DCPOMATIC_FFMPEG_FILE_ENCODER_H
 
 
+#include "audio_mapping.h"
+#include "dcpomatic_time.h"
 #include "encoder.h"
 #include "event_history.h"
-#include "audio_mapping.h"
 #include "log.h"
 #include <dcp/key.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 }
+LIBDCP_ENABLE_WARNINGS
 
 
 class ExportAudioStream;
 
 
+enum class ExportFormat
+{
+	PRORES_HQ,
+	H264_AAC,
+	SUBTITLES_DCP
+};
+
+
 class FFmpegFileEncoder
 {
 public:
@@ -70,7 +82,7 @@ private:
 	static void buffer_free(void* opaque, uint8_t* data);
 	void buffer_free2(uint8_t* data);
 
-	AVCodec* _video_codec = nullptr;
+	AVCodec const * _video_codec = nullptr;
 	AVCodecContext* _video_codec_context = nullptr;
 	std::vector<std::shared_ptr<ExportAudioStream>> _audio_streams;
 	bool _audio_stream_per_channel;