Only define UNICODE in src/lib/{cross_windows,util}.cc.

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

diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index f253c73a0d9b69d6c7d29f41dbf87eb8e3aa8a10..533fd151c648cb083e6b6e57b3db80edf27ae19d 100644 (file)
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -29,6 +29,9 @@
 #include "image.h"
 #include "cross.h"
 #include "compose.hpp"
+extern "C" {
+#include <libavutil/channel_layout.h>
+}
 #include <iostream>
 
 #include "i18n.h"
@@ -203,7 +206,7 @@ public:
 
 private:
        AVFormatContext* _format_context;
-       AVCodec* _codec;
+       AVCodec const * _codec;
        AVCodecContext* _codec_context;
        AVStream* _stream;
        int _stream_index;