diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-26 23:36:24 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-26 23:36:24 +0100 |
| commit | 4616b19fb5241a54c9d57f7a91bb975f41aed14b (patch) | |
| tree | d067450cb12dd3629fe88ef9a578c6b1cabe7884 /test/make_black_test.cc | |
| parent | f1d30fb114b3b2c6ccd8fdf5823e7cd6b26c1eef (diff) | |
| parent | 20fa26ea6ecfdbecea8bb1230c8388cce3fd521f (diff) | |
Merge master.
Diffstat (limited to 'test/make_black_test.cc')
| -rw-r--r-- | test/make_black_test.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/make_black_test.cc b/test/make_black_test.cc index 0ae2fd137..f6c3a4bb2 100644 --- a/test/make_black_test.cc +++ b/test/make_black_test.cc @@ -40,12 +40,12 @@ BOOST_AUTO_TEST_CASE (make_black_test) dcp::Size out_size (1024, 1024); list<AVPixelFormat> pix_fmts; - pix_fmts.push_back (AV_PIX_FMT_RGB24); + pix_fmts.push_back (AV_PIX_FMT_RGB24); // 2 pix_fmts.push_back (AV_PIX_FMT_ARGB); pix_fmts.push_back (AV_PIX_FMT_RGBA); pix_fmts.push_back (AV_PIX_FMT_ABGR); pix_fmts.push_back (AV_PIX_FMT_BGRA); - pix_fmts.push_back (AV_PIX_FMT_YUV420P); + pix_fmts.push_back (AV_PIX_FMT_YUV420P); // 0 pix_fmts.push_back (AV_PIX_FMT_YUV411P); pix_fmts.push_back (AV_PIX_FMT_YUV422P10LE); pix_fmts.push_back (AV_PIX_FMT_YUV422P16LE); @@ -75,7 +75,8 @@ BOOST_AUTO_TEST_CASE (make_black_test) pix_fmts.push_back (AV_PIX_FMT_YUVA420P16LE); pix_fmts.push_back (AV_PIX_FMT_YUVA422P16LE); pix_fmts.push_back (AV_PIX_FMT_YUVA444P16LE); - + pix_fmts.push_back (AV_PIX_FMT_RGB555LE); // 46 + int N = 0; 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)); |