diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-06-12 21:23:10 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-06-12 21:23:10 +0200 |
| commit | 407b3f5a4696d1c2f77e6167bca10f880b168f9c (patch) | |
| tree | 4d68a98fb655ed84e706ceb530cbbd4687b9b57a | |
| parent | c8a036eb727ceddc64a0304d781c916eb952c001 (diff) | |
Move ExportFormat definition to ffmpeg_file_encoder.h
| -rw-r--r-- | src/lib/export_config.h | 2 | ||||
| -rw-r--r-- | src/lib/ffmpeg_file_encoder.h | 8 | ||||
| -rw-r--r-- | src/lib/types.h | 7 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/export_config.h b/src/lib/export_config.h index 2b0ddfda2..47dddb6c3 100644 --- a/src/lib/export_config.h +++ b/src/lib/export_config.h @@ -23,7 +23,7 @@ #define DCPOMATIC_EXPORT_CONFIG_H -#include "types.h" +#include "ffmpeg_file_encoder.h" #include <libcxml/cxml.h> diff --git a/src/lib/ffmpeg_file_encoder.h b/src/lib/ffmpeg_file_encoder.h index 08be9255a..ec68839a0 100644 --- a/src/lib/ffmpeg_file_encoder.h +++ b/src/lib/ffmpeg_file_encoder.h @@ -41,6 +41,14 @@ LIBDCP_ENABLE_WARNINGS class ExportAudioStream; +enum class ExportFormat +{ + PRORES, + H264_AAC, + SUBTITLES_DCP +}; + + class FFmpegFileEncoder { public: diff --git a/src/lib/types.h b/src/lib/types.h index 9b322bdae..f2a79b2fd 100644 --- a/src/lib/types.h +++ b/src/lib/types.h @@ -167,13 +167,6 @@ extern std::string text_type_to_string (TextType t); extern std::string text_type_to_name (TextType t); extern TextType string_to_text_type (std::string s); -enum class ExportFormat -{ - PRORES, - H264_AAC, - SUBTITLES_DCP -}; - /** @struct Crop * @brief A description of the crop of an image or video. */ |