diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-08-03 21:24:51 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-08-03 21:24:51 +0200 |
| commit | 4e2ff7851127cd85c3e7d78b42eb884d0cda0ac3 (patch) | |
| tree | 4d998510add120ab95838f2455a94cc565248fd6 /src/lib | |
| parent | e14c78e13eab9125a875e90b97c7dab77aa46b90 (diff) | |
Fix build with newer FFmpeg.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ffmpeg_examiner.cc | 3 | ||||
| -rw-r--r-- | src/lib/ffmpeg_file_encoder.cc | 3 | ||||
| -rw-r--r-- | src/lib/util.cc | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc index bd6a9b20d..853db90be 100644 --- a/src/lib/ffmpeg_examiner.cc +++ b/src/lib/ffmpeg_examiner.cc @@ -33,8 +33,9 @@ extern "C" { #include <libavformat/avformat.h> #include <libavutil/pixfmt.h> #include <libavutil/pixdesc.h> -#include <libavutil/eval.h> +#include <libavutil/channel_layout.h> #include <libavutil/display.h> +#include <libavutil/eval.h> } DCPOMATIC_ENABLE_WARNINGS #include <iostream> diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc index 83e707725..533fd151c 100644 --- a/src/lib/ffmpeg_file_encoder.cc +++ b/src/lib/ffmpeg_file_encoder.cc @@ -29,6 +29,9 @@ #include "image.h" #include "cross.h" #include "compose.hpp" +extern "C" { +#include <libavutil/channel_layout.h> +} #include <iostream> #include "i18n.h" diff --git a/src/lib/util.cc b/src/lib/util.cc index 2d2a63c35..4ce677bf6 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -367,10 +367,12 @@ dcpomatic_setup () SetUnhandledExceptionFilter(exception_handler); #endif +#ifdef DCPOMATIC_HAVE_AVREGISTER DCPOMATIC_DISABLE_WARNINGS av_register_all (); avfilter_register_all (); DCPOMATIC_ENABLE_WARNINGS +#endif #ifdef DCPOMATIC_OSX /* Add our library directory to the libltdl search path so that |