Merge master and multifarious hackery.

1 files changed, 3 insertions, 26 deletions

diff --git a/src/lib/image.h b/src/lib/image.h
index de03d0e3f..34f87b188 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -32,10 +32,8 @@ extern "C" {
 #include <libavfilter/avfilter.h>
 }
 #include "util.h"
-#include "ffmpeg_compatibility.h"
 
 class Scaler;
-class RGBFrameImage;
 class SimpleImage;
 
 /** @class Image
@@ -92,6 +90,8 @@ protected:
 	virtual void swap (Image &);
 	float bytes_per_pixel (int) const;
 
+	friend class pixel_formats_test;
+
 private:
 	void yuv_16_black (uint16_t);
 	static uint16_t swap_16 (uint16_t);
@@ -99,30 +99,6 @@ private:
 	AVPixelFormat _pixel_format; ///< FFmpeg's way of describing the pixel format of this Image
 };
 
-/** @class FilterBufferImage
- *  @brief An Image that is held in an AVFilterBufferRef.
- */
-class FilterBufferImage : public Image
-{
-public:
-	FilterBufferImage (AVPixelFormat, AVFilterBufferRef *);
-	~FilterBufferImage ();
-
-	uint8_t ** data () const;
-	int * line_size () const;
-	int * stride () const;
-	libdcp::Size size () const;
-	bool aligned () const;
-
-private:
-	/* Not allowed */
-	FilterBufferImage (FilterBufferImage const &);
-	FilterBufferImage& operator= (FilterBufferImage const &);
-	
-	AVFilterBufferRef* _buffer;
-	int* _line_size;
-};
-
 /** @class SimpleImage
  *  @brief An Image for which memory is allocated using a `simple' av_malloc().
  */
@@ -130,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 &);