Remove swaroop variant.

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

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 1c0dad3dc6fc15eb324f61c61b3324e4fcec0893..3852f51a5fca2d83c87f6286050b8fe2d7537d8c 100644 (file)
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -53,6 +53,8 @@ public:
                return _first_video;
        }
 
+       VideoRange range () const;
+
        AVColorRange color_range () const {
                return video_codec_context()->color_range;
        }
@@ -75,14 +77,12 @@ public:
                return _rotation;
        }
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       boost::optional<std::string> id () const {
-               return _id;
+       bool pulldown () const {
+               return _pulldown;
        }
-#endif
 
 private:
-       void video_packet (AVCodecContext *);
+       void video_packet (AVCodecContext *, std::string& temporal_reference);
        void audio_packet (AVCodecContext *, boost::shared_ptr<FFmpegAudioStream>);
 
        std::string stream_name (AVStream* s) const;
@@ -99,10 +99,7 @@ private:
        bool _need_video_length;
 
        boost::optional<double> _rotation;
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       boost::optional<std::string> _id;
-#endif
+       bool _pulldown;
 
        struct SubtitleStart
        {