diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-05-21 23:30:36 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-05-21 23:30:36 +0100 |
| commit | 5003c20e6c4adcc2d58a292082186c8d3b625d88 (patch) | |
| tree | 0f95373cdddc0e487c4f879c1579b6bcac767d7d | |
| parent | 1e1dc6d6d15a5c20d61fd084fa305162c93f47c9 (diff) | |
Try some forward-compatibility build fixes for newer FFmpegs.
| -rw-r--r-- | src/lib/environment_info.cc | 2 | ||||
| -rw-r--r-- | src/lib/ffmpeg_encoder.cc | 2 | ||||
| -rw-r--r-- | src/lib/filter_graph.cc | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc index 0956d003d..7e2b90167 100644 --- 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 a8a033990..e4f258368 100644 --- 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 44f20f7ef..52826f3d0 100644 --- 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> |