Note that newer libsub version is required.

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

diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index 59b2dedd5bd5d05998b67e1485f33ec33d2c2a3c..834c8946c0e50679a6b4e8765ae30d3baa519ca1 100644 (file)
--- a/src/lib/ffmpeg.h
+++ b/src/lib/ffmpeg.h
@@ -25,12 +25,12 @@
 
 #include "file_group.h"
 #include "ffmpeg_subtitle_period.h"
-#include "warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 extern "C" {
 #include <libavcodec/avcodec.h>
 }
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread/mutex.hpp>
 
 
@@ -93,9 +93,6 @@ private:
        void setup_general ();
        void setup_decoders ();
 
-       static void ffmpeg_log_callback (void* ptr, int level, const char* fmt, va_list vl);
-       static std::weak_ptr<Log> _ffmpeg_log;
-
        /** AVFrames used for decoding audio streams; accessed with audio_frame() */
        std::map<std::shared_ptr<const FFmpegAudioStream>, AVFrame*> _audio_frame;
 };