X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_file_encoder.cc;h=533fd151c648cb083e6b6e57b3db80edf27ae19d;hb=68dfd11399fa0da4c36c0379402b526cada9b3ba;hp=29ee7455b5d4ed680ff93c0791946cbb1fb9b917;hpb=c699b77bce027c3ab70f04c411dc43f3ba628b28;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index 29ee7455b..533fd151c 100644
--- 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;
@@ -416,7 +419,7 @@ FFmpegFileEncoder::video (shared_ptr<PlayerVideo> video, DCPTime time)
 	}
 
 	for (int i = 0; i < 3; ++i) {
-		AVBufferRef* buffer = av_buffer_create(image->data()[i], image->stride()[i] * image->size().height, &buffer_free, this, 0);
+		auto buffer = av_buffer_create(image->data()[i], image->stride()[i] * image->size().height, &buffer_free, this, 0);
 		frame->buf[i] = av_buffer_ref (buffer);
 		frame->data[i] = buffer->data;
 		frame->linesize[i] = image->stride()[i];