Build fixes for Boost >= 1.73

[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 c11d12a8263442252a33f2b8a241da1b1b5a2074..511730185716ddba8368b828f76228f775d5eeba 100644 (file)
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -40,6 +40,9 @@ using boost::bind;
 using boost::weak_ptr;
 using boost::optional;
 using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 int FFmpegFileEncoder::_video_stream_index = 0;
 int FFmpegFileEncoder::_audio_stream_index_base = 1;
@@ -295,6 +298,15 @@ FFmpegFileEncoder::FFmpegFileEncoder (
        _pending_audio.reset (new AudioBuffers(channels, 0));
 }
 
+
+FFmpegFileEncoder::~FFmpegFileEncoder ()
+{
+       _audio_streams.clear ();
+       avcodec_close (_video_codec_context);
+       avformat_free_context (_format_context);
+}
+
+
 AVPixelFormat
 FFmpegFileEncoder::pixel_format (ExportFormat format)
 {
@@ -403,11 +415,6 @@ DCPOMATIC_ENABLE_WARNINGS
        }
 
        av_write_trailer (_format_context);
-
-       _audio_streams.clear ();
-       avcodec_close (_video_codec_context);
-       avio_close (_format_context->pb);
-       avformat_free_context (_format_context);
 }
 
 void