diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-02-02 22:39:43 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-02-02 22:39:43 +0000 |
| commit | 7a1bd472537fee593a3f088655324861d24e804b (patch) | |
| tree | 42319544a2413d1252c9465f29acbc0b7b5299e9 /src/lib/image.h | |
| parent | b255fcca7f57c7068603a104adbb645fe5701c21 (diff) | |
Changes to libdcp API.
Diffstat (limited to 'src/lib/image.h')
| -rw-r--r-- | src/lib/image.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/image.h b/src/lib/image.h index 814ad1c58..b929f4dfc 100644 --- a/src/lib/image.h +++ b/src/lib/image.h @@ -27,7 +27,6 @@ #include "position.h" #include "position_image.h" #include "types.h" -#include <dcp/image.h> extern "C" { #include <libavcodec/avcodec.h> #include <libavfilter/avfilter.h> @@ -39,7 +38,7 @@ extern "C" { class Scaler; class Socket; -class Image : public dcp::Image +class Image { public: Image (AVPixelFormat, dcp::Size, bool); @@ -87,7 +86,8 @@ private: float bytes_per_pixel (int) const; void yuv_16_black (uint16_t, bool); static uint16_t swap_16 (uint16_t); - + + dcp::Size _size; AVPixelFormat _pixel_format; ///< FFmpeg's way of describing the pixel format of this Image uint8_t** _data; ///< array of pointers to components int* _line_size; ///< array of sizes of the data in each line, in pixels (without any alignment padding bytes) |