const fix; header guard.

[dcpomatic.git] / src / lib / ffmpeg_content.h

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index c5797d5d1b63761d6409fe055ed69692e8db6518..3159abfd190b1ea30929e75b9e83d4299ca0accf 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -23,9 +23,6 @@
 #include "video_content.h"
 #include "audio_content.h"
 #include "subtitle_content.h"
-#include "audio_mapping.h"
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/lexical_cast.hpp>
 
 struct AVFormatContext;
 struct AVStream;
@@ -104,6 +101,9 @@ public:
 
        std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
 
+protected:
+       void add_properties (std::list<std::pair<std::string, std::string> > &) const;
+
 private:
        friend struct ffmpeg_pts_offset_test;
        friend struct audio_sampling_rate_test;
@@ -114,6 +114,12 @@ private:
        boost::optional<ContentTime> _first_video;
        /** Video filters that should be used when generating DCPs */
        std::vector<Filter const *> _filters;
+
+       AVColorRange _color_range;
+       AVColorPrimaries _color_primaries;
+       AVColorTransferCharacteristic _color_trc;
+       AVColorSpace _colorspace;
+       boost::optional<int> _bits_per_pixel;
 };
 
 #endif