Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/image.h b/src/lib/image.h
index 7c5f50a622f9b9c07aaaf8b465387088c06b2f59..416ee3a8d8fd25b0f5cca0176a9e53af48af7085 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -27,6 +27,9 @@
 #include "position.h"
 #include "position_image.h"
 #include "types.h"
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
 #include <dcp/colour_conversion.h>
 #include <boost/shared_ptr.hpp>
 
@@ -36,7 +39,7 @@ class Socket;
 class Image
 {
 public:
-       Image (AVPixelFormat, dcp::Size, bool);
+       Image (AVPixelFormat, dcp::Size, bool, int extra_pixels = 0);
        Image (AVFrame *);
        Image (Image const &);
        Image (boost::shared_ptr<const Image>, bool);
@@ -85,6 +88,7 @@ private:
        int* _line_size; ///< array of sizes of the data in each line, in pixels (without any alignment padding bytes)
        int* _stride; ///< array of strides for each line (including any alignment padding bytes)
        bool _aligned;
+       int _extra_pixels;
 };
 
 extern PositionImage merge (std::list<PositionImage> images);