Switch PlayerVideo::always_rgb to a new ::force and use it in FFmpegFileEncoder.

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

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 6599eeaa0b4489e110562337934de8ebc8180355..8e41e8f2371dc5dff5d504aabf65fad32acca172 100644 (file)
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -65,7 +65,7 @@ public:
        void prepare ();
        boost::shared_ptr<Image> image (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const;
 
-       static AVPixelFormat always_rgb (AVPixelFormat);
+       static AVPixelFormat force (AVPixelFormat, AVPixelFormat);
        static AVPixelFormat keep_xyz_or_rgb (AVPixelFormat);
 
        void add_metadata (xmlpp::Node* node) const;