Merge master.

diff --cc src/lib/decoder.cc
Simple merge

diff --cc src/lib/film.cc
Simple merge

diff --cc src/lib/options.h
index d8b99815d933167a5ef5cc3519c6d02203e548dd,f4381ef684de4798a2e0e68e6c6f56a6dce78ba2..aef9ca112a5c9bc175f679d9567beb89930bad53
--- 1/src/lib/options.h
--- 2/src/lib/options.h
+++ b/src/lib/options.h
@@@ -39,7 -39,8 +39,7 @@@ public
        Options (std::string f, std::string e, std::string m)
                : padding (0)
                , apply_crop (true)
-               , decode_video_frequency (0)
 -              , black_after (0)
+               , decode_video_skip (0)
                , decode_audio (true)
                , decode_subtitles (false)
                , _frame_out_path (f)
@@@ -96,7 -97,9 +96,8 @@@
        float ratio;                ///< ratio of the wanted output image (not considering padding)
        int padding;                ///< number of pixels of padding (in terms of the output size) each side of the image
        bool apply_crop;            ///< true to apply cropping
-       int decode_video_frequency; ///< skip frames so that this many are decoded in all (or 0) (for generating thumbnails)
 -      int black_after;            ///< first frame for which to output a black frame, rather than the actual video content, or 0 for none
+       int decode_video_skip;      ///< skip frames such that we don't decode any frame where (index % decode_video_skip) != 0; e.g.
+                                   ///< 1 for every frame, 2 for every other frame, etc.
        bool decode_audio;          ///< true to decode audio, otherwise false
        bool decode_subtitles;
  

diff --cc src/lib/tiff_decoder.cc
Simple merge