Merge branch '1.0' into 1.0-seek

[dcpomatic.git] / src / lib / encoder.cc

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 046a3248ef13fe0d3586cb6d6e41d3997a3913fb..475c230da5ac1f3ba4458afd6cb55d062810e365 100644 (file)
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -217,7 +217,7 @@ Encoder::process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversi
                _queue.push_back (shared_ptr<DCPVideoFrame> (
                                          new DCPVideoFrame (
                                                  image->image(PIX_FMT_RGB24, false), _video_frames_out, eyes, conversion, _film->video_frame_rate(),
-                                                 _film->j2k_bandwidth(), _film->log()
+                                                 _film->j2k_bandwidth(), _film->resolution(), _film->log()
                                                  )
                                          ));