summaryrefslogtreecommitdiff
path: root/src/lib/image.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-03 10:01:36 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-03 10:01:36 +0100
commit3fc3aad8735903ced3dae65f764eb33e3f5b3f11 (patch)
treebe6e5dd91a8c8b07e50a93f835ccff2706907441 /src/lib/image.h
parentfdd63a4c9925f0339089dce3a52f0d6ed0d97880 (diff)
Try to fix the filter / AVFrame ownership.
Diffstat (limited to 'src/lib/image.h')
-rw-r--r--src/lib/image.h27
1 files changed, 1 insertions, 26 deletions
diff --git a/src/lib/image.h b/src/lib/image.h
index 16fbd28c2..70dacfaee 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -34,7 +34,6 @@ extern "C" {
#include "util.h"
class Scaler;
-class RGBFrameImage;
class SimpleImage;
/** @class Image
@@ -100,31 +99,6 @@ private:
AVPixelFormat _pixel_format; ///< FFmpeg's way of describing the pixel format of this Image
};
-/** @class FrameImage
- * @brief An Image that is held in an AVFrame.
- */
-class FrameImage : public Image
-{
-public:
- FrameImage (AVFrame *, bool);
- ~FrameImage ();
-
- uint8_t ** data () const;
- int * line_size () const;
- int * stride () const;
- libdcp::Size size () const;
- bool aligned () const;
-
-private:
- /* Not allowed */
- FrameImage (FrameImage const &);
- FrameImage& operator= (FrameImage const &);
-
- AVFrame* _frame;
- bool _own;
- int* _line_size;
-};
-
/** @class SimpleImage
* @brief An Image for which memory is allocated using a `simple' av_malloc().
*/
@@ -132,6 +106,7 @@ class SimpleImage : public Image
{
public:
SimpleImage (AVPixelFormat, libdcp::Size, bool);
+ SimpleImage (AVFrame *);
SimpleImage (SimpleImage const &);
SimpleImage (boost::shared_ptr<const Image>);
SimpleImage& operator= (SimpleImage const &);