Rearrange some includes of dcpomatic_time.h

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

diff --git a/src/lib/ffmpeg_file_encoder.h b/src/lib/ffmpeg_file_encoder.h
index 8a727106a7fe44194ceb72b957ea0cff4b0ce7c7..08be9255af451dca68c016803eb2779df5cfff00 100644 (file)
--- a/src/lib/ffmpeg_file_encoder.h
+++ b/src/lib/ffmpeg_file_encoder.h
@@ -23,15 +23,19 @@
 #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;
@@ -70,7 +74,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;