pot/merge.

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

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 0a6cab9069e189c9ea6bdf1161a1a9912edf59a1..01b1c74f53e29e4878673759f2f73d3fb78031c1 100644 (file)
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -19,6 +19,7 @@
 
 #include "types.h"
 #include "position.h"
+#include "dcpomatic_time.h"
 #include "colour_conversion.h"
 #include "position_image.h"
 extern "C" {
@@ -29,7 +30,6 @@ extern "C" {
 class Image;
 class ImageProxy;
 class Socket;
-class Data;
 
 /** Everything needed to describe a video frame coming out of the player, but with the
  *  bits still their raw form.  We may want to combine the bits on a remote machine,
@@ -54,13 +54,13 @@ public:
 
        void set_subtitle (PositionImage);
 
-       boost::shared_ptr<Image> image (AVPixelFormat pix_fmt, dcp::NoteHandler note) const;
+       boost::shared_ptr<Image> image (dcp::NoteHandler note) const;
 
        void add_metadata (xmlpp::Node* node) const;
        void send_binary (boost::shared_ptr<Socket> socket) const;
 
        bool has_j2k () const;
-       Data j2k () const;
+       dcp::Data j2k () const;
 
        DCPTime time () const {
                return _time;