Try some forward-compatibility build fixes for newer FFmpegs.

diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc
index 0956d003dcf266f151d4e9e695d833af84ac7e4d..7e2b901671addb946802126c58384ae884bf80a4 100644 (file)
--- a/src/lib/environment_info.cc
+++ b/src/lib/environment_info.cc
@@ -43,7 +43,7 @@ extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libswscale/swscale.h>
-#include <libavfilter/avfiltergraph.h>
+#include <libavfilter/avfilter.h>
 #include <libavutil/pixfmt.h>
 }
 #include <boost/thread.hpp>

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index a8a03399098ea7919dc91aba4f90b352e23f1ee8..e4f2583683451e3c40d4cdcc590ed82b3fbf342c 100644 (file)
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -123,7 +123,7 @@ FFmpegEncoder::setup_video ()
        _video_codec_context->height = _film->frame_size().height;
        _video_codec_context->time_base = (AVRational) { 1, _film->video_frame_rate() };
        _video_codec_context->pix_fmt = _pixel_format;
-       _video_codec_context->flags |= CODEC_FLAG_QSCALE | CODEC_FLAG_GLOBAL_HEADER;
+       _video_codec_context->flags |= AV_CODEC_FLAG_QSCALE | AV_CODEC_FLAG_GLOBAL_HEADER;
 }
 
 void

diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index 44f20f7efe3d344172f174da63df06e531f9df80..52826f3d0566cb0a4745a6472fb201b0c4d5a101 100644 (file)
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -28,7 +28,6 @@
 #include "image.h"
 #include "compose.hpp"
 extern "C" {
-#include <libavfilter/avfiltergraph.h>
 #include <libavfilter/buffersrc.h>
 #include <libavfilter/buffersink.h>
 #include <libavformat/avio.h>