Merge master.

[dcpomatic.git] / test / pixel_formats_test.cc

diff --git a/test/pixel_formats_test.cc b/test/pixel_formats_test.cc
index 84f2a33ce325209614ae519a36a5fc4113104dab..fb2278fdbba39e8125bd43955a928fa3763a015e 100644 (file)
--- a/test/pixel_formats_test.cc
+++ b/test/pixel_formats_test.cc
@@ -43,9 +43,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,6 +62,7 @@ BOOST_AUTO_TEST_CASE (pixel_formats_test)
                f->width = 640;
                f->height = 480;
                f->format = static_cast<int> (i->format);
+               av_frame_get_buffer (f, true);
                SimpleImage t (f);
                BOOST_CHECK_EQUAL(t.components(), i->components);
                BOOST_CHECK_EQUAL(t.lines(0), i->lines[0]);