From: Carl Hetherington <cth@carlh.net>
Date: Sun, 12 Jun 2022 19:23:10 +0000 (+0200)
Subject: Move ExportFormat definition to ffmpeg_file_encoder.h
X-Git-Tag: v2.16.15~20
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=407b3f5a4696d1c2f77e6167bca10f880b168f9c

Move ExportFormat definition to ffmpeg_file_encoder.h
---

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.
  */