diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-15 09:14:43 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-15 09:14:43 +0100 |
| commit | b67a3505b58ffd204ee1a2560be3026688be8f10 (patch) | |
| tree | ca714b9d7101a9973573d89a5be586d3a0edd4b9 /test/image_test.cc | |
| parent | 0165a71f3074233f03c868cce9b760e51cc10ff5 (diff) | |
Use AV_ prefixes on some FFmpeg bits.
Diffstat (limited to 'test/image_test.cc')
| -rw-r--r-- | test/image_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/image_test.cc b/test/image_test.cc index b7f4f10fe..55fbb9907 100644 --- a/test/image_test.cc +++ b/test/image_test.cc @@ -35,7 +35,7 @@ using boost::shared_ptr; BOOST_AUTO_TEST_CASE (aligned_image_test) { - Image* s = new Image (PIX_FMT_RGB24, dcp::Size (50, 50), true); + Image* s = new Image (AV_PIX_FMT_RGB24, dcp::Size (50, 50), true); BOOST_CHECK_EQUAL (s->planes(), 1); /* 160 is 150 aligned to the nearest 32 bytes */ BOOST_CHECK_EQUAL (s->stride()[0], 160); @@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE (aligned_image_test) BOOST_CHECK_EQUAL (t->stride()[0], s->stride()[0]); /* assignment operator */ - Image* u = new Image (PIX_FMT_YUV422P, dcp::Size (150, 150), false); + Image* u = new Image (AV_PIX_FMT_YUV422P, dcp::Size (150, 150), false); *u = *s; BOOST_CHECK_EQUAL (u->planes(), 1); BOOST_CHECK_EQUAL (u->stride()[0], 160); @@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE (aligned_image_test) BOOST_AUTO_TEST_CASE (compact_image_test) { - Image* s = new Image (PIX_FMT_RGB24, dcp::Size (50, 50), false); + Image* s = new Image (AV_PIX_FMT_RGB24, dcp::Size (50, 50), false); BOOST_CHECK_EQUAL (s->planes(), 1); BOOST_CHECK_EQUAL (s->stride()[0], 50 * 3); BOOST_CHECK_EQUAL (s->line_size()[0], 50 * 3); @@ -111,7 +111,7 @@ BOOST_AUTO_TEST_CASE (compact_image_test) BOOST_CHECK_EQUAL (t->stride()[0], s->stride()[0]); /* assignment operator */ - Image* u = new Image (PIX_FMT_YUV422P, dcp::Size (150, 150), true); + Image* u = new Image (AV_PIX_FMT_YUV422P, dcp::Size (150, 150), true); *u = *s; BOOST_CHECK_EQUAL (u->planes(), 1); BOOST_CHECK_EQUAL (u->stride()[0], 50 * 3); |