Try to warn if we're running the 32-bit version on 64-bit windows (WoW64) (#1569).

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

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index 5356c5ce2fd8aae6786493b10c4052e59fab43a8..687d2981ee11108dd72ecb86a3d663c2d720fff9 100644 (file)
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -59,7 +59,6 @@ private:
                        int video_frame_rate,
                        int audio_frame_rate,
                        int channels,
-                       boost::shared_ptr<Log> log,
                        ExportFormat,
                        int x264_crf,
                        bool three_d,
@@ -79,7 +78,7 @@ private:
        int _output_audio_channels;
 
        mutable boost::mutex _mutex;
-       DCPTime _last_time;
+       dcpomatic::DCPTime _last_time;
 
        EventHistory _history;