diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-01-24 22:30:52 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-01-25 19:44:56 +0100 |
| commit | 9c8d2ed2e112596f7bb970d20f9240ec4519ec3e (patch) | |
| tree | 17a3572aea8c28bc48af0c25055408336090e988 /src/lib/ffmpeg.cc | |
| parent | f471db4e8dc7f3dd1eb7a9cf4d8d11e7d340df65 (diff) | |
Cleanup: move some methods from util to memory_util
Diffstat (limited to 'src/lib/ffmpeg.cc')
| -rw-r--r-- | src/lib/ffmpeg.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc index 0f63ea172..a54b4fc01 100644 --- a/src/lib/ffmpeg.cc +++ b/src/lib/ffmpeg.cc @@ -19,18 +19,19 @@ */ +#include "compose.hpp" +#include "config.h" +#include "dcpomatic_log.h" +#include "digester.h" +#include "exceptions.h" #include "ffmpeg.h" +#include "ffmpeg_audio_stream.h" #include "ffmpeg_content.h" +#include "ffmpeg_subtitle_stream.h" #include "film.h" -#include "exceptions.h" -#include "util.h" #include "log.h" -#include "dcpomatic_log.h" -#include "ffmpeg_subtitle_stream.h" -#include "ffmpeg_audio_stream.h" -#include "digester.h" -#include "compose.hpp" -#include "config.h" +#include "memory_util.h" +#include "util.h" #include <dcp/raw_convert.h> extern "C" { #include <libavcodec/avcodec.h> |