From ac1d52f98e8db9d428b08eb1de655ddfc83836e3 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 10 Jun 2014 10:24:06 +0100
Subject: [PATCH] Fix server/client with non-RGB24 images.

---
 ChangeLog              | 2 ++
 src/lib/image_proxy.cc | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c03d54e9a..a402353d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2014-06-09  Carl Hetherington  <cth@carlh.net>
 
+	* Fix server/client with non-RGB24 sources.
+
 	* Make audio gain a floating-point value in the UI (#367).
 
 	* Work-around out-of-memory crashes with large start trims (#252).
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
-- 
2.30.2