pot/merge.

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

diff --git a/src/lib/image.h b/src/lib/image.h
index 89cd98f7b281bd6cfe68a758e3b8ceb33625d3a9..2d267f861e72a64cd337036bfe815943350a077a 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -27,15 +27,13 @@
 #include "position.h"
 #include "position_image.h"
 #include "types.h"
-#include <dcp/colour_conversion.h>
 extern "C" {
-#include <libavcodec/avcodec.h>
-#include <libavfilter/avfilter.h>
+#include <libavutil/pixfmt.h>
 }
+#include <dcp/colour_conversion.h>
 #include <boost/shared_ptr.hpp>
-#include <boost/function.hpp>
-#include <string>
 
+struct AVFrame;
 class Socket;
 
 class Image
@@ -49,17 +47,17 @@ public:
        ~Image ();
 
        uint8_t * const * data () const;
-       int * line_size () const;
+       int const * line_size () const;
        int const * stride () const;
        dcp::Size size () const;
        bool aligned () const;
 
+       int planes () const;
        int components () const;
        int line_factor (int) const;
-       int lines (int) const;
+       dcp::Size sample_size (int) const;
 
        boost::shared_ptr<Image> scale (dcp::Size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat, bool aligned) const;
-       boost::shared_ptr<Image> crop (Crop c, bool aligned) const;
        boost::shared_ptr<Image> crop_scale_window (Crop c, dcp::Size, dcp::Size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat, bool aligned) const;
 
        void make_black ();