diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-10 10:24:06 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-10 10:24:06 +0100 |
| commit | ac1d52f98e8db9d428b08eb1de655ddfc83836e3 (patch) | |
| tree | b51815360a7687624bf0b305111c989936996201 /src/lib/image_proxy.cc | |
| parent | 0f28d40f2f41b5a71bc1ed8192ebb575dbd2dc50 (diff) | |
Fix server/client with non-RGB24 images.
Diffstat (limited to 'src/lib/image_proxy.cc')
| -rw-r--r-- | src/lib/image_proxy.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc index 618cdbcf3..4e2f8a135 100644 --- a/src/lib/image_proxy.cc +++ b/src/lib/image_proxy.cc @@ -55,7 +55,7 @@ RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc xml->number_child<int> ("Width"), xml->number_child<int> ("Height") ); - _image.reset (new Image (PIX_FMT_RGB24, size, true)); + _image.reset (new Image (static_cast<AVPixelFormat> (xml->number_child<int> ("PixelFormat")), size, true)); _image->read_from_socket (socket); } @@ -71,6 +71,7 @@ RawImageProxy::add_metadata (xmlpp::Node* node) const node->add_child("Type")->add_child_text (N_("Raw")); node->add_child("Width")->add_child_text (libdcp::raw_convert<string> (_image->size().width)); node->add_child("Height")->add_child_text (libdcp::raw_convert<string> (_image->size().height)); + node->add_child("PixelFormat")->add_child_text (libdcp::raw_convert<string> (_image->pixel_format ())); } void |