X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_still_encoder.cc;h=de2f1eb468ac9a194e29abf0c9191a122e37b1c7;hb=44b57d623dec97a3f9955082f0b8a7a8d27b7518;hp=2b8aca6492554398427d734a41f3c31c88518675;hpb=009a58293bf2e9727d544d1a2648422cc395d81e;p=dcpomatic.git diff --git a/src/lib/j2k_still_encoder.cc b/src/lib/j2k_still_encoder.cc index 2b8aca649..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->subtitle_offset, _fs->subtitle_scale, _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