summaryrefslogtreecommitdiff
path: root/src/lib/image_proxy.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-05-25 00:57:16 +0200
committerCarl Hetherington <cth@carlh.net>2021-05-25 21:35:12 +0200
commit62f9b78a2eb5f0fc6b9028264bac6ad501d83309 (patch)
treea187c6385350318f7d96090d09712106ac08ed19 /src/lib/image_proxy.cc
parent5d9ff746138a30c1469b788afe5a4eee25fed368 (diff)
Move video level conversion for RGB from FFmpegImageProxy to Image.
Since FFmpeg does not do video level conversion for RGB sources when we (sort of) ask it to in Image::crop_scale_window() it seems to make more sense to compensate for that by calling full_to_video_range() in the same place (rather than in FFmpegImageProxy).
Diffstat (limited to 'src/lib/image_proxy.cc')
-rw-r--r--src/lib/image_proxy.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc
index d81a3ffef..9e456c941 100644
--- a/src/lib/image_proxy.cc
+++ b/src/lib/image_proxy.cc
@@ -45,7 +45,7 @@ image_proxy_factory (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
if (xml->string_child("Type") == N_("Raw")) {
return make_shared<RawImageProxy>(xml, socket);
} else if (xml->string_child("Type") == N_("FFmpeg")) {
- return shared_ptr<FFmpegImageProxy> (new FFmpegImageProxy(xml, socket));
+ return make_shared<FFmpegImageProxy>(socket);
} else if (xml->string_child("Type") == N_("J2K")) {
return make_shared<J2KImageProxy>(xml, socket);
}