summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-11-06 20:20:48 +0000
committerCarl Hetherington <cth@carlh.net>2013-11-06 20:20:48 +0000
commit8cbf628ec5cc8422d9bf01d7482b1b7fb7d02b69 (patch)
tree98f51cab45c494309369f5e33f9c7ea23145ac7f
parentb498722efc903900e264ac820bea08b6a99db3c8 (diff)
Support pixel format 30.
-rw-r--r--ChangeLog4
-rw-r--r--src/lib/image.cc6
-rw-r--r--test/make_black_test.cc4
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 74309c6b5..bf58b0852 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2013-11-06 Carl Hetherington <cth@carlh.net>
+ * Support pixel format 30 (#254).
+
+2013-11-06 Carl Hetherington <cth@carlh.net>
+
* Version 1.27 released.
2013-11-06 Carl Hetherington <cth@carlh.net>
diff --git a/src/lib/image.cc b/src/lib/image.cc
index d56b8763a..048cc4ab6 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -297,7 +297,11 @@ Image::make_black ()
yuv_16_black (sixteen_bit_uv, true);
break;
- case PIX_FMT_RGB24:
+ case PIX_FMT_RGB24:
+ case PIX_FMT_ARGB:
+ case PIX_FMT_RGBA:
+ case PIX_FMT_ABGR:
+ case PIX_FMT_BGRA:
memset (data()[0], 0, lines(0) * stride()[0]);
break;
diff --git a/test/make_black_test.cc b/test/make_black_test.cc
index 2960a596f..30e6ae78b 100644
--- a/test/make_black_test.cc
+++ b/test/make_black_test.cc
@@ -37,6 +37,10 @@ BOOST_AUTO_TEST_CASE (make_black_test)
list<AVPixelFormat> pix_fmts;
pix_fmts.push_back (AV_PIX_FMT_RGB24);
+ 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_YUV422P10LE);
pix_fmts.push_back (AV_PIX_FMT_YUV422P16LE);