Use AV_ prefixes on some FFmpeg bits.

3 files changed, 10 insertions, 10 deletions

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index dcd62ba96..26554e46c 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -55,7 +55,7 @@ do_remote_encode (shared_ptr<DCPVideo> frame, ServerDescription description, Dat
 
 BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 {
-	shared_ptr<Image> image (new Image (PIX_FMT_RGB24, dcp::Size (1998, 1080), true));
+	shared_ptr<Image> image (new Image (AV_PIX_FMT_RGB24, dcp::Size (1998, 1080), true));
 	uint8_t* p = image->data()[0];
 
 	for (int y = 0; y < 1080; ++y) {
@@ -68,7 +68,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 		p += image->stride()[0];
 	}
 
-	shared_ptr<Image> sub_image (new Image (PIX_FMT_RGBA, dcp::Size (100, 200), true));
+	shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_RGBA, dcp::Size (100, 200), true));
 	p = sub_image->data()[0];
 	for (int y = 0; y < 200; ++y) {
 		uint8_t* q = p;
@@ -139,7 +139,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 
 BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 {
-	shared_ptr<Image> image (new Image (PIX_FMT_YUV420P, dcp::Size (1998, 1080), true));
+	shared_ptr<Image> image (new Image (AV_PIX_FMT_YUV420P, dcp::Size (1998, 1080), true));
 
 	for (int i = 0; i < image->planes(); ++i) {
 		uint8_t* p = image->data()[i];
@@ -148,7 +148,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 		}
 	}
 
-	shared_ptr<Image> sub_image (new Image (PIX_FMT_RGBA, dcp::Size (100, 200), true));
+	shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_RGBA, dcp::Size (100, 200), true));
 	uint8_t* p = sub_image->data()[0];
 	for (int y = 0; y < 200; ++y) {
 		uint8_t* q = p;
@@ -219,7 +219,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 
 BOOST_AUTO_TEST_CASE (client_server_test_j2k)
 {
-	shared_ptr<Image> image (new Image (PIX_FMT_YUV420P, dcp::Size (1998, 1080), true));
+	shared_ptr<Image> image (new Image (AV_PIX_FMT_YUV420P, dcp::Size (1998, 1080), true));
 
 	for (int i = 0; i < image->planes(); ++i) {
 		uint8_t* p = image->data()[i];
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);
diff --git a/test/make_black_test.cc b/test/make_black_test.cc
index ec5aa6999..23f4a71ff 100644
--- a/test/make_black_test.cc
+++ b/test/make_black_test.cc
@@ -80,7 +80,7 @@ BOOST_AUTO_TEST_CASE (make_black_test)
 	for (list<AVPixelFormat>::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) {
 		boost::shared_ptr<Image> foo (new Image (*i, in_size, true));
 		foo->make_black ();
-		boost::shared_ptr<Image> bar = foo->scale (out_size, dcp::YUV_TO_RGB_REC601, PIX_FMT_RGB24, true);
+		boost::shared_ptr<Image> bar = foo->scale (out_size, dcp::YUV_TO_RGB_REC601, AV_PIX_FMT_RGB24, true);
 
 		uint8_t* p = bar->data()[0];
 		for (int y = 0; y < bar->size().height; ++y) {