Move ExportFormat definition to ffmpeg_file_encoder.h

diff --git a/src/lib/export_config.h b/src/lib/export_config.h
index 2b0ddfda237dbebc9815aee94fbb3ae05f5ecc6d..47dddb6c3783c8ce6a5e7542256d2b996df35b13 100644 (file)
--- 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 08be9255af451dca68c016803eb2779df5cfff00..ec68839a0766d3f4adb725d9a05d0b478df5702c 100644 (file)
--- 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 9b322bdaeea5da81ebec291135b1a12b10db9962..f2a79b2fdcbd879c25f7484ec918afc1d8130f95 100644 (file)
--- 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.
  */