X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_still_encoder.cc;h=de2f1eb468ac9a194e29abf0c9191a122e37b1c7;hb=cbaed1119cdf3acb8662e5240f59706722437d94;hp=a241dd6e35165468029afe99e00896b770cf254c;hpb=cc4a67b7eb8ecaed076e261960848f70e3e741af;p=dcpomatic.git diff --git a/src/lib/j2k_still_encoder.cc b/src/lib/j2k_still_encoder.cc index a241dd6e3..de2f1eb46 100644 --- a/src/lib/j2k_still_encoder.cc +++ b/src/lib/j2k_still_encoder.cc @@ -50,9 +50,9 @@ J2KStillEncoder::J2KStillEncoder (shared_ptr s, shared_ptr yuv, int frame, shared_ptr sub) { - pair const s = Filter::ffmpeg_strings (_fs->filters); + pair const s = Filter::ffmpeg_strings (_fs->filters()); DCPVideoFrame* f = new DCPVideoFrame ( - yuv, sub, _opt->out_size, _opt->padding, _fs->scaler, 0, _fs->frames_per_second, s.second, + yuv, sub, _opt->out_size, _opt->padding, _fs->subtitle_offset(), _fs->subtitle_scale(), _fs->scaler(), 0, _fs->frames_per_second(), s.second, Config::instance()->colour_lut_index(), Config::instance()->j2k_bandwidth(), _log ); @@ -63,7 +63,7 @@ J2KStillEncoder::process_video (shared_ptr yuv, int frame, shared_ptrframe_out_path (0, false); - for (int i = 1; i < (_fs->still_duration * ImageMagickDecoder::static_frames_per_second()); ++i) { + for (int i = 1; i < (_fs->still_duration() * ImageMagickDecoder::static_frames_per_second()); ++i) { if (!boost::filesystem::exists (_opt->frame_out_path (i, false))) { string const link = _opt->frame_out_path (i, false); #ifdef DVDOMATIC_POSIX