summaryrefslogtreecommitdiff
path: root/src/lib/encoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-09-27 13:43:19 +0200
committerCarl Hetherington <cth@carlh.net>2021-09-27 13:43:19 +0200
commit952084c4221c5708e02c783284cf0f7239c6b4c4 (patch)
treec1521dab0586b6c33e02c9338c94abdc6b4c2ea9 /src/lib/encoder.cc
parent6e3e984162ca7a181bc7c98d90c295e88e4e7f6c (diff)
parent81b9ea804cb9953bb1a4074f208f63374adbf09b (diff)
Merge branch 'better-gl' into v2.15.x
This changes the GL video view to use more modern GL (GLSL etc.) It also special-cases JPEG2000 video playback and does scaling and colourspace conversion on the GPU.
Diffstat (limited to 'src/lib/encoder.cc')
-rw-r--r--src/lib/encoder.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index fe27cb7dd..1d688c318 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -41,7 +41,7 @@
Encoder::Encoder (std::shared_ptr<const Film> film, std::weak_ptr<Job> job)
: _film (film)
, _job (job)
- , _player (new Player(film))
+ , _player (new Player(film, Image::Alignment::PADDED))
{
}