diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-07-27 21:47:26 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-07-27 21:47:26 +0200 |
| commit | 2da4caba7871455c097c0ed940dd6f2332dbda5d (patch) | |
| tree | f87883d0fcfe4c19ae5f7490306d49cc4f5d02b3 /src/lib/ffmpeg.h | |
| parent | 94aadbd62c259a73d7511522dd167d519c68c5f9 (diff) | |
| parent | 5d440e1133fc68dfffeaf53cf934b996dae811c7 (diff) | |
Merge branch 'warnings' into v2.15.x.
Clean up our handling of compiler warnings in a variety of ways,
and use #pragma rather than -Wno to only disable warnings where
necessary.
Diffstat (limited to 'src/lib/ffmpeg.h')
| -rw-r--r-- | src/lib/ffmpeg.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h index 10517055c..e6399c076 100644 --- a/src/lib/ffmpeg.h +++ b/src/lib/ffmpeg.h @@ -23,9 +23,12 @@ #include "file_group.h" #include "ffmpeg_subtitle_period.h" +#include "warnings.h" +DCPOMATIC_DISABLE_WARNINGS extern "C" { #include <libavcodec/avcodec.h> } +DCPOMATIC_ENABLE_WARNINGS #include <boost/shared_ptr.hpp> #include <boost/thread/mutex.hpp> |