X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fpixel_formats_test.cc;h=1b720d9bf5d3b88fe2ecf1f2399c1c9209674bdc;hb=734340b52d30cb2dde9aa9e81c77277b261b128e;hp=84f2a33ce325209614ae519a36a5fc4113104dab;hpb=5f0f0de782100a5cb558f30c7768c8af0c19bcb7;p=dcpomatic.git

diff --git a/test/pixel_formats_test.cc b/test/pixel_formats_test.cc
index 84f2a33ce..1b720d9bf 100644
--- a/test/pixel_formats_test.cc
+++ b/test/pixel_formats_test.cc
@@ -17,6 +17,14 @@
 
 */
 
+#include <boost/test/unit_test.hpp>
+#include <list>
+extern "C" {
+#include <libavutil/pixfmt.h>
+#include <libavcodec/avcodec.h>
+}
+#include "lib/image.h"
+
 using std::list;
 using std::cout;
 
@@ -43,9 +51,6 @@ struct Case
 
 BOOST_AUTO_TEST_CASE (pixel_formats_test)
 {
-	/* This needs to happen in the first test */
-	dvdomatic_setup ();
-
 	list<Case> cases;
 	cases.push_back(Case(AV_PIX_FMT_RGB24,       1, 480, 480, 480, 3, 0,   0  ));
 	cases.push_back(Case(AV_PIX_FMT_RGBA,        1, 480, 480, 480, 4, 0,   0  ));
@@ -65,7 +70,8 @@ BOOST_AUTO_TEST_CASE (pixel_formats_test)
 		f->width = 640;
 		f->height = 480;
 		f->format = static_cast<int> (i->format);
-		SimpleImage t (f);
+		av_frame_get_buffer (f, true);
+		Image t (f);
 		BOOST_CHECK_EQUAL(t.components(), i->components);
 		BOOST_CHECK_EQUAL(t.lines(0), i->lines[0]);
 		BOOST_CHECK_EQUAL(t.lines(1), i->lines[1]);